From 26775c365901eb099baa798ea0a1e38b6d9d51c9 Mon Sep 17 00:00:00 2001 From: Jules Aguillon Date: Thu, 20 Apr 2023 10:55:57 +0200 Subject: [PATCH 01/85] ocamlformat: 0.24.1 -> 0.25.1 The ocamlformat package have been split into two in version 0.25.1: one for the library and one for the executable. This adds both packages at the same time. They have the same sources and very similar dependencies, for which the definition is shared. --- .../ocaml-modules/ocamlformat/generic.nix | 63 +++++++++++++++++++ .../ocamlformat/ocamlformat-lib.nix | 26 ++++++++ .../ocamlformat-rpc-lib.nix} | 0 .../tools/ocaml/ocamlformat/default.nix | 1 + .../tools/ocaml/ocamlformat/generic.nix | 61 ++++-------------- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/ocaml-packages.nix | 4 +- 7 files changed, 107 insertions(+), 50 deletions(-) create mode 100644 pkgs/development/ocaml-modules/ocamlformat/generic.nix create mode 100644 pkgs/development/ocaml-modules/ocamlformat/ocamlformat-lib.nix rename pkgs/development/ocaml-modules/{ocamlformat-rpc-lib/default.nix => ocamlformat/ocamlformat-rpc-lib.nix} (100%) diff --git a/pkgs/development/ocaml-modules/ocamlformat/generic.nix b/pkgs/development/ocaml-modules/ocamlformat/generic.nix new file mode 100644 index 000000000000..9f9f7cff1301 --- /dev/null +++ b/pkgs/development/ocaml-modules/ocamlformat/generic.nix @@ -0,0 +1,63 @@ +{ lib, fetchurl, ocaml-ng, version }: + +# The ocamlformat package have been split into two in version 0.25.1: +# one for the library and one for the executable. +# Both have the same sources and very similar dependencies. + +with ocaml-ng.ocamlPackages; + +rec { + tarballName = "ocamlformat-${version}.tbz"; + + src = fetchurl { + url = + "https://github.com/ocaml-ppx/ocamlformat/releases/download/${version}/${tarballName}"; + sha256 = { + "0.19.0" = "0ihgwl7d489g938m1jvgx8azdgq9f5np5mzqwwya797hx2m4dz32"; + "0.20.0" = "sha256-JtmNCgwjbCyUE4bWqdH5Nc2YSit+rekwS43DcviIfgk="; + "0.20.1" = "sha256-fTpRZFQW+ngoc0T6A69reEUAZ6GmHkeQvxspd5zRAjU="; + "0.21.0" = "sha256-KhgX9rxYH/DM6fCqloe4l7AnJuKrdXSe6Y1XY3BXMy0="; + "0.22.4" = "sha256-61TeK4GsfMLmjYGn3ICzkagbc3/Po++Wnqkb2tbJwGA="; + "0.23.0" = "sha256-m9Pjz7DaGy917M1GjyfqG5Lm5ne7YSlJF2SVcDHe3+0="; + "0.24.0" = "sha256-Zil0wceeXmq2xy0OVLxa/Ujl4Dtsmc4COyv6Jo7rVaM="; + "0.24.1" = "sha256-AjQl6YGPgOpQU3sjcaSnZsFJqZV9BYB+iKAE0tX0Qc4="; + "0.25.1" = "sha256-3I8qMwyjkws2yssmI7s2Dti99uSorNKT29niJBpv0z0="; + }."${version}"; + }; + + odoc-parser_v = odoc-parser.override { + version = if lib.versionAtLeast version "0.24.0" then + "2.0.0" + else if lib.versionAtLeast version "0.20.1" then + "1.0.1" + else + "0.9.0"; + }; + + cmdliner_v = + if lib.versionAtLeast version "0.21.0" then cmdliner_1_1 else cmdliner_1_0; + + library_deps = [ + base + cmdliner_v + dune-build-info + fix + fpath + menhirLib + menhirSdk + ocp-indent + stdio + uuseg + uutf + ] ++ lib.optionals (lib.versionAtLeast version "0.20.0") [ + either + ocaml-version + ] ++ lib.optionals (lib.versionAtLeast version "0.22.4") [ csexp ] + ++ (if lib.versionOlder version "0.25.1" then + [ odoc-parser_v ] + else [ + camlp-streams + result + astring + ]); +} diff --git a/pkgs/development/ocaml-modules/ocamlformat/ocamlformat-lib.nix b/pkgs/development/ocaml-modules/ocamlformat/ocamlformat-lib.nix new file mode 100644 index 000000000000..af8b574d5d6f --- /dev/null +++ b/pkgs/development/ocaml-modules/ocamlformat/ocamlformat-lib.nix @@ -0,0 +1,26 @@ +{ lib, callPackage, ocaml-ng, version ? "0.25.1" }: + +with ocaml-ng.ocamlPackages; + +let inherit (callPackage ./generic.nix { inherit version; }) src library_deps; + +in assert (lib.versionAtLeast version "0.25.1"); + +buildDunePackage { + pname = "ocamlformat-lib"; + inherit src version; + + minimalOCamlVersion = "4.08"; + duneVersion = "3"; + + nativeBuildInputs = [ menhir ]; + + propagatedBuildInputs = library_deps; + + meta = { + homepage = "https://github.com/ocaml-ppx/ocamlformat"; + description = "Auto-formatter for OCaml code (library)"; + maintainers = [ lib.maintainers.Zimmi48 lib.maintainers.marsam ]; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/development/ocaml-modules/ocamlformat-rpc-lib/default.nix b/pkgs/development/ocaml-modules/ocamlformat/ocamlformat-rpc-lib.nix similarity index 100% rename from pkgs/development/ocaml-modules/ocamlformat-rpc-lib/default.nix rename to pkgs/development/ocaml-modules/ocamlformat/ocamlformat-rpc-lib.nix diff --git a/pkgs/development/tools/ocaml/ocamlformat/default.nix b/pkgs/development/tools/ocaml/ocamlformat/default.nix index f90eaca5273c..f0f38777f1c2 100644 --- a/pkgs/development/tools/ocaml/ocamlformat/default.nix +++ b/pkgs/development/tools/ocaml/ocamlformat/default.nix @@ -12,6 +12,7 @@ rec { ocamlformat_0_22_4 = ocamlformat.override { version = "0.22.4"; }; ocamlformat_0_23_0 = ocamlformat.override { version = "0.23.0"; }; ocamlformat_0_24_1 = ocamlformat.override { version = "0.24.1"; }; + ocamlformat_0_25_1 = ocamlformat.override { version = "0.25.1"; }; ocamlformat = callPackage ./generic.nix {}; } diff --git a/pkgs/development/tools/ocaml/ocamlformat/generic.nix b/pkgs/development/tools/ocaml/ocamlformat/generic.nix index 4ed53aad3789..0d38d2e0ac02 100644 --- a/pkgs/development/tools/ocaml/ocamlformat/generic.nix +++ b/pkgs/development/tools/ocaml/ocamlformat/generic.nix @@ -1,61 +1,26 @@ -{ lib, fetchurl, fetchzip, ocaml-ng -, version ? "0.24.1" -, tarballName ? "ocamlformat-${version}.tbz", -}: +{ lib, callPackage, ocaml-ng, version ? "0.25.1" }: -let src = - fetchurl { - url = "https://github.com/ocaml-ppx/ocamlformat/releases/download/${version}/${tarballName}"; - sha256 = { - "0.19.0" = "0ihgwl7d489g938m1jvgx8azdgq9f5np5mzqwwya797hx2m4dz32"; - "0.20.0" = "sha256-JtmNCgwjbCyUE4bWqdH5Nc2YSit+rekwS43DcviIfgk="; - "0.20.1" = "sha256-fTpRZFQW+ngoc0T6A69reEUAZ6GmHkeQvxspd5zRAjU="; - "0.21.0" = "sha256-KhgX9rxYH/DM6fCqloe4l7AnJuKrdXSe6Y1XY3BXMy0="; - "0.22.4" = "sha256-61TeK4GsfMLmjYGn3ICzkagbc3/Po++Wnqkb2tbJwGA="; - "0.23.0" = "sha256-m9Pjz7DaGy917M1GjyfqG5Lm5ne7YSlJF2SVcDHe3+0="; - "0.24.0" = "sha256-Zil0wceeXmq2xy0OVLxa/Ujl4Dtsmc4COyv6Jo7rVaM="; - "0.24.1" = "sha256-AjQl6YGPgOpQU3sjcaSnZsFJqZV9BYB+iKAE0tX0Qc4="; - }."${version}"; - }; - ocamlPackages = ocaml-ng.ocamlPackages; -in +with ocaml-ng.ocamlPackages; -with ocamlPackages; +let + inherit (callPackage ../../../ocaml-modules/ocamlformat/generic.nix { + inherit version; + }) + src library_deps; -buildDunePackage { +in buildDunePackage { pname = "ocamlformat"; inherit src version; minimalOCamlVersion = "4.08"; duneVersion = "3"; - nativeBuildInputs = [ - menhir - ]; + nativeBuildInputs = + if lib.versionAtLeast version "0.25.1" then [ ] else [ menhir ]; - buildInputs = [ - base - dune-build-info - fix - fpath - menhirLib - menhirSdk - ocp-indent - re - stdio - uuseg - uutf - ] - ++ lib.optionals (lib.versionAtLeast version "0.20.0") [ ocaml-version either ] - ++ (if lib.versionAtLeast version "0.24.0" - then [ (odoc-parser.override { version = "2.0.0"; }) ] - else if lib.versionAtLeast version "0.20.1" - then [ (odoc-parser.override { version = "1.0.1"; }) ] - else [ (odoc-parser.override { version = "0.9.0"; }) ]) - ++ (if lib.versionAtLeast version "0.21.0" - then [ cmdliner_1_1 ] - else [ cmdliner_1_0 ]) - ++ lib.optionals (lib.versionAtLeast version "0.22.4") [ csexp ]; + buildInputs = [ re ] ++ library_deps + ++ lib.optionals (lib.versionAtLeast version "0.25.1") + [ (ocamlformat-lib.override { inherit version; }) ]; meta = { homepage = "https://github.com/ocaml-ppx/ocamlformat"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ecc9e21686b5..bbc9d4ac44be 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15814,7 +15814,7 @@ with pkgs; inherit (callPackage ../development/tools/ocaml/ocamlformat { }) ocamlformat # latest version ocamlformat_0_19_0 ocamlformat_0_20_0 ocamlformat_0_20_1 ocamlformat_0_21_0 - ocamlformat_0_22_4 ocamlformat_0_23_0 ocamlformat_0_24_1; + ocamlformat_0_22_4 ocamlformat_0_23_0 ocamlformat_0_24_1 ocamlformat_0_25_1; orc = callPackage ../development/compilers/orc { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 0185ed26d42f..7b8a2da42b49 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1163,7 +1163,9 @@ let ocamlc-loc = callPackage ../development/ocaml-modules/ocamlc-loc { }; - ocamlformat-rpc-lib = callPackage ../development/ocaml-modules/ocamlformat-rpc-lib { }; + ocamlformat-lib = callPackage ../development/ocaml-modules/ocamlformat/ocamlformat-lib.nix { }; + + ocamlformat-rpc-lib = callPackage ../development/ocaml-modules/ocamlformat/ocamlformat-rpc-lib.nix { }; ocamlfuse = callPackage ../development/ocaml-modules/ocamlfuse { }; From 5bd77fec8393a791a7bd2db3a0d320b1d7402199 Mon Sep 17 00:00:00 2001 From: Jules Aguillon Date: Thu, 20 Apr 2023 11:33:43 +0200 Subject: [PATCH 02/85] maintainers: add Julow --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7e99a5aba827..60c64894f8c3 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7853,6 +7853,13 @@ githubId = 21160136; name = "Julien Moutinho"; }; + Julow = { + email = "jules@j3s.fr"; + matrix = "@juloo:matrix.org"; + github = "Julow"; + githubId = 2310568; + name = "Jules Aguillon"; + }; jumper149 = { email = "felixspringer149@gmail.com"; github = "jumper149"; From 3833306fc4c166e54062c99796b6bc309a0defef Mon Sep 17 00:00:00 2001 From: Jules Aguillon Date: Thu, 20 Apr 2023 11:37:52 +0200 Subject: [PATCH 03/85] ocamlformat: add maintainer Julow --- pkgs/development/ocaml-modules/ocamlformat/ocamlformat-lib.nix | 2 +- .../ocaml-modules/ocamlformat/ocamlformat-rpc-lib.nix | 2 +- pkgs/development/tools/ocaml/ocamlformat/generic.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocamlformat/ocamlformat-lib.nix b/pkgs/development/ocaml-modules/ocamlformat/ocamlformat-lib.nix index af8b574d5d6f..a95f8d9a410b 100644 --- a/pkgs/development/ocaml-modules/ocamlformat/ocamlformat-lib.nix +++ b/pkgs/development/ocaml-modules/ocamlformat/ocamlformat-lib.nix @@ -20,7 +20,7 @@ buildDunePackage { meta = { homepage = "https://github.com/ocaml-ppx/ocamlformat"; description = "Auto-formatter for OCaml code (library)"; - maintainers = [ lib.maintainers.Zimmi48 lib.maintainers.marsam ]; + maintainers = with lib.maintainers; [ Zimmi48 marsam Julow ]; license = lib.licenses.mit; }; } diff --git a/pkgs/development/ocaml-modules/ocamlformat/ocamlformat-rpc-lib.nix b/pkgs/development/ocaml-modules/ocamlformat/ocamlformat-rpc-lib.nix index 81328dc78df6..abd3a33dde8e 100644 --- a/pkgs/development/ocaml-modules/ocamlformat/ocamlformat-rpc-lib.nix +++ b/pkgs/development/ocaml-modules/ocamlformat/ocamlformat-rpc-lib.nix @@ -30,6 +30,6 @@ buildDunePackage rec { homepage = "https://github.com/ocaml-ppx/ocamlformat"; description = "Auto-formatter for OCaml code (RPC mode)"; license = licenses.mit; - maintainers = with maintainers; [ Zimmi48 marsam ]; + maintainers = with maintainers; [ Zimmi48 marsam Julow ]; }; } diff --git a/pkgs/development/tools/ocaml/ocamlformat/generic.nix b/pkgs/development/tools/ocaml/ocamlformat/generic.nix index 0d38d2e0ac02..d63d0d9894b0 100644 --- a/pkgs/development/tools/ocaml/ocamlformat/generic.nix +++ b/pkgs/development/tools/ocaml/ocamlformat/generic.nix @@ -25,7 +25,7 @@ in buildDunePackage { meta = { homepage = "https://github.com/ocaml-ppx/ocamlformat"; description = "Auto-formatter for OCaml code"; - maintainers = [ lib.maintainers.Zimmi48 lib.maintainers.marsam ]; + maintainers = with lib.maintainers; [ Zimmi48 marsam Julow ]; license = lib.licenses.mit; }; } From f65f9b215ed7d7543474eee1d2bb7baa99a08cd5 Mon Sep 17 00:00:00 2001 From: Antoine Eiche Date: Sat, 13 May 2023 10:12:24 +0200 Subject: [PATCH 04/85] pythonPackages.devpi-common: mark as broken It fails to build because it depends on packaging <22 while we use packaging >22. See the following issues for details: - https://github.com/NixOS/nixpkgs/issues/231346 - https://github.com/devpi/devpi/issues/939 --- pkgs/development/python-modules/devpi-common/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/devpi-common/default.nix b/pkgs/development/python-modules/devpi-common/default.nix index 4295506989ab..0a05e0843587 100644 --- a/pkgs/development/python-modules/devpi-common/default.nix +++ b/pkgs/development/python-modules/devpi-common/default.nix @@ -35,5 +35,11 @@ buildPythonPackage rec { description = "Utilities jointly used by devpi-server and devpi-client"; license = licenses.mit; maintainers = with maintainers; [ lewo makefu ]; + # It fails to build because it depends on packaging <22 while we + # use packaging >22. + # See the following issues for details: + # - https://github.com/NixOS/nixpkgs/issues/231346 + # - https://github.com/devpi/devpi/issues/939 + broken = true; }; } From 96299edd4cac0d5e8d7b653346cd53f683f47a8b Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 16 Jun 2023 11:26:30 +1200 Subject: [PATCH 05/85] contributing: Explain how to run common tests As a beginning contributor, it is far from obvious where to find tests, how to run individual tests locally for quick development, and which tests do what. The new "Testing changes" section aims to help with all of these. Co-authored-by: Emily --- CONTRIBUTING.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2dd9b62cf953..f318f19ead39 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -61,6 +61,15 @@ Pull requests should not be squash merged in order to keep complete commit messa This means that, when addressing review comments in order to keep the pull request in an always mergeable status, you will sometimes need to rewrite your branch's history and then force-push it with `git push --force-with-lease`. Useful git commands that can help a lot with this are `git commit --patch --amend` and `git rebase --interactive`. For more details consult the git man pages or online resources like [git-rebase.io](https://git-rebase.io/) or [The Pro Git Book](https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History). +## Testing changes + +To run the main types of tests locally: + +- Run package-internal tests with `nix-build --attr pkgs.PACKAGE.passthru.tests` +- Run [NixOS tests](https://nixos.org/manual/nixos/unstable/#sec-nixos-tests) with `nix-build --attr nixosTest.NAME`, where `NAME` is the name of the test listed in `nixos/tests/all-tests.nix` +- Run [global package tests](https://nixos.org/manual/nixpkgs/unstable/#sec-package-tests) with `nix-build --attr tests.PACKAGE`, where `PACKAGE` is the name of the test listed in `pkgs/test/default.nix` +- See `lib/tests/NAME.nix` for instructions on running specific library tests + ## Rebasing between branches (i.e. from master to staging) From time to time, changes between branches must be rebased, for example, if the From f468c07e5f3656a5e545c84a3908f17533404d85 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Wed, 21 Jun 2023 12:05:31 +0200 Subject: [PATCH 06/85] codeql: fix passing in nix JDK The old approach only set CODEQL_JAVA_HOME in codeql, but apparently that didn't propagate to other tools such as the various `autobuild.sh` scripts. Setting it in a wrapper did seem to work for `codeql database create testdb --language javascript` but not for `codeql database analyze ...`. This approach based on the earlier PR by Bas fixed both commands for me. Co-Authored-By: Bas Alberts --- pkgs/development/tools/analysis/codeql/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index 9cd79c13288c..3e7e399256e4 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -34,8 +34,13 @@ stdenv.mkDerivation rec { ln -sf $out/codeql/tools/linux64/lib64trace.so $out/codeql/tools/linux64/libtrace.so - sed -i 's%\$CODEQL_DIST/tools/\$CODEQL_PLATFORM/java-aarch64%\${jdk17}%g' $out/codeql/codeql - sed -i 's%\$CODEQL_DIST/tools/\$CODEQL_PLATFORM/java%\${jdk17}%g' $out/codeql/codeql + # many of the codeql extractors use CODEQL_DIST + CODEQL_PLATFORM to + # resolve java home, so to be able to create databases, we want to make + # sure that they point somewhere sane/usable since we can not autopatch + # the codeql packaged java dist, but we DO want to patch the extractors + # as well as the builders which are ELF binaries for the most part + rm -rf $out/codeql/tools/linux64/java + ln -s ${jdk17} $out/codeql/tools/linux64/java ln -s $out/codeql/codeql $out/bin/ ''; From 037e87f37acb37d9a7b5b80abfc8efb751d0f155 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Jun 2023 04:11:18 +0000 Subject: [PATCH 07/85] gitoxide: 0.26.0 -> 0.27.0 --- pkgs/applications/version-management/gitoxide/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/gitoxide/default.nix b/pkgs/applications/version-management/gitoxide/default.nix index 040595c0e188..bf04b2424f05 100644 --- a/pkgs/applications/version-management/gitoxide/default.nix +++ b/pkgs/applications/version-management/gitoxide/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "gitoxide"; - version = "0.26.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = "Byron"; repo = "gitoxide"; rev = "v${version}"; - sha256 = "sha256-RAcKnS7vLuzXBxasHBxjmrdxyVvexou0SmiVu6ysZOQ="; + sha256 = "sha256-L5x27rJ9Y3K886OlTvCXV2LY+6L/f6vokCbgrWPCiHY="; }; - cargoHash = "sha256-w2WfBQoccpE71jOrjeuNF6HPTfY6lxpzg/AUEIngSJo="; + cargoHash = "sha256-YEHHu9PJ5aJvWUaTXCNKEaV/Rd8lP6Wub/CFJCBykHU="; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ curl ] ++ (if stdenv.isDarwin From 25e1b2bbefcac0f0727927d7f7b5d1d4f8da582a Mon Sep 17 00:00:00 2001 From: Emmanuel Rosa Date: Sun, 23 Apr 2023 18:35:32 -0400 Subject: [PATCH 08/85] sparrow: add missing JVM arguments --- pkgs/applications/blockchains/sparrow/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/blockchains/sparrow/default.nix b/pkgs/applications/blockchains/sparrow/default.nix index eecc313af6ec..b4c2ec720eb9 100644 --- a/pkgs/applications/blockchains/sparrow/default.nix +++ b/pkgs/applications/blockchains/sparrow/default.nix @@ -47,9 +47,11 @@ let --add-opens javafx.controls/com.sun.javafx.scene.control=centerdevice.nsmenufx --add-opens javafx.graphics/com.sun.javafx.menu=centerdevice.nsmenufx --add-opens javafx.graphics/com.sun.glass.ui=com.sparrowwallet.sparrow + --add-opens=javafx.graphics/javafx.scene.input=com.sparrowwallet.sparrow --add-opens javafx.graphics/com.sun.javafx.application=com.sparrowwallet.sparrow --add-opens java.base/java.net=com.sparrowwallet.sparrow --add-opens java.base/java.io=com.google.gson + --add-opens=java.smartcardio/sun.security.smartcardio=com.sparrowwallet.sparrow --add-reads com.sparrowwallet.merged.module=java.desktop --add-reads com.sparrowwallet.merged.module=java.sql --add-reads com.sparrowwallet.merged.module=com.sparrowwallet.sparrow From 5ae84c13355717013d31371000b1f4983a82e60f Mon Sep 17 00:00:00 2001 From: Emmanuel Rosa Date: Sun, 23 Apr 2023 18:43:15 -0400 Subject: [PATCH 09/85] sparrow: fix .desktop file --- pkgs/applications/blockchains/sparrow/default.nix | 15 ++++++++------- pkgs/applications/blockchains/sparrow/fhsenv.nix | 4 ++-- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/blockchains/sparrow/default.nix b/pkgs/applications/blockchains/sparrow/default.nix index b4c2ec720eb9..a16c7e0b9af7 100644 --- a/pkgs/applications/blockchains/sparrow/default.nix +++ b/pkgs/applications/blockchains/sparrow/default.nix @@ -167,9 +167,9 @@ stdenv.mkDerivation rec { desktopItems = [ (makeDesktopItem { - name = "Sparrow"; - exec = pname; - icon = pname; + name = "sparrow-desktop"; + exec = "sparrow-desktop"; + icon = "sparrow-desktop"; desktopName = "Sparrow Bitcoin Wallet"; genericName = "Bitcoin Wallet"; categories = [ "Finance" "Network" ]; @@ -187,7 +187,7 @@ stdenv.mkDerivation rec { for n in 16 24 32 48 64 96 128 256; do size=$n"x"$n mkdir -p $out/hicolor/$size/apps - convert lib/Sparrow.png -resize $size $out/hicolor/$size/apps/sparrow.png + convert lib/Sparrow.png -resize $size $out/hicolor/$size/apps/sparrow-desktop.png done; ''; }; @@ -197,9 +197,9 @@ stdenv.mkDerivation rec { mkdir -p $out/bin $out ln -s ${sparrow-modules}/modules $out/lib - install -D -m 777 ${launcher} $out/bin/sparrow - substituteAllInPlace $out/bin/sparrow - substituteInPlace $out/bin/sparrow --subst-var-by jdkModules ${jdk-modules} + install -D -m 777 ${launcher} $out/bin/sparrow-desktop + substituteAllInPlace $out/bin/sparrow-desktop + substituteInPlace $out/bin/sparrow-desktop --subst-var-by jdkModules ${jdk-modules} mkdir -p $out/share/icons ln -s ${sparrow-icons}/hicolor $out/share/icons @@ -222,5 +222,6 @@ stdenv.mkDerivation rec { license = licenses.asl20; maintainers = with maintainers; [ emmanuelrosa _1000101 ]; platforms = [ "x86_64-linux" ]; + mainProgram = "sparrow-desktop"; }; } diff --git a/pkgs/applications/blockchains/sparrow/fhsenv.nix b/pkgs/applications/blockchains/sparrow/fhsenv.nix index ae14e6e4a591..26bf9da0b85d 100644 --- a/pkgs/applications/blockchains/sparrow/fhsenv.nix +++ b/pkgs/applications/blockchains/sparrow/fhsenv.nix @@ -4,9 +4,9 @@ }: buildFHSEnv { - name = "sparrow"; + name = "sparrow-desktop"; - runScript = "${sparrow-unwrapped}/bin/sparrow"; + runScript = "${sparrow-unwrapped}/bin/sparrow-desktop"; targetPkgs = pkgs: with pkgs; [ sparrow-unwrapped From a8006f29bac9eede3bb45f0971c4acc8d1361c82 Mon Sep 17 00:00:00 2001 From: Emmanuel Rosa Date: Tue, 27 Jun 2023 11:43:32 -0400 Subject: [PATCH 10/85] sparrow: 1.7.6 -> 1.7.7 --- pkgs/applications/blockchains/sparrow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/sparrow/default.nix b/pkgs/applications/blockchains/sparrow/default.nix index a16c7e0b9af7..61217c8b4de2 100644 --- a/pkgs/applications/blockchains/sparrow/default.nix +++ b/pkgs/applications/blockchains/sparrow/default.nix @@ -21,11 +21,11 @@ let pname = "sparrow"; - version = "1.7.6"; + version = "1.7.7"; src = fetchurl { url = "https://github.com/sparrowwallet/${pname}/releases/download/${version}/${pname}-${version}-x86_64.tar.gz"; - sha256 = "01ksl790i8swvj8nvl2r27bbd8kad80shsbw3di39925841dp8z3"; + sha256 = "07mgh6xjj8i4d2pvwldl2y586y4fw9ir0rzxr97bh379fdcfqfxa"; }; launcher = writeScript "sparrow" '' From 2640caf136b90401494e52fcad8177d7023677ed Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Mon, 24 Oct 2022 19:36:47 +0200 Subject: [PATCH 11/85] transmission-rss: init at 0.3.1 --- .../networking/transmission-rss/default.nix | 29 +++++++++++++++++++ .../update-cargo-lock-version.patch | 13 +++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 44 insertions(+) create mode 100644 pkgs/tools/networking/transmission-rss/default.nix create mode 100644 pkgs/tools/networking/transmission-rss/update-cargo-lock-version.patch diff --git a/pkgs/tools/networking/transmission-rss/default.nix b/pkgs/tools/networking/transmission-rss/default.nix new file mode 100644 index 000000000000..50056c3ebdbc --- /dev/null +++ b/pkgs/tools/networking/transmission-rss/default.nix @@ -0,0 +1,29 @@ +{ stdenv, lib, fetchFromGitHub, rustPlatform, pkg-config, openssl }: + +rustPlatform.buildRustPackage rec { + version = "0.3.1"; + pname = "transmission-rss"; + + src = fetchFromGitHub { + owner = "herlon214"; + repo = pname; + rev = "5bbad7a81621a194b7a8b11a56051308a7ccbf06"; + sha256 = "sha256-SkEgxinqPA9feOIF68oewVyRKv3SY6fWWZLGJeH+r4M="; + }; + + cargoPatches = [ ./update-cargo-lock-version.patch ]; + + cargoSha256 = "sha256-QNMdqoxxY8ao2O44hJxZNgLrPwzu9+ieweTPc7pfFY4="; + + nativeBuildInputs = [pkg-config]; + buildInputs = [openssl]; + + OPENSSL_NO_VENDOR = 1; + + meta = with lib; { + description = "Add torrents to transmission based on RSS list"; + homepage = "https://github.com/herlon214/transmission-rss"; + maintainers = with maintainers; [ icewind1991 ]; + license = licenses.mit; + }; +} diff --git a/pkgs/tools/networking/transmission-rss/update-cargo-lock-version.patch b/pkgs/tools/networking/transmission-rss/update-cargo-lock-version.patch new file mode 100644 index 000000000000..cd5e30adb29d --- /dev/null +++ b/pkgs/tools/networking/transmission-rss/update-cargo-lock-version.patch @@ -0,0 +1,13 @@ +diff --git a/Cargo.lock b/Cargo.lock +index e75aca4..88321ec 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -2148,7 +2148,7 @@ dependencies = [ + + [[package]] + name = "transmission-rss" +-version = "0.3.0" ++version = "0.3.1" + dependencies = [ + "clap", + "env_logger", \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5282d4968775..a937ae35c5fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1817,6 +1817,8 @@ with pkgs; topicctl = callPackage ../tools/misc/topicctl { }; + transmission-rss = callPackage ../tools/networking/transmission-rss { }; + trigger-control = callPackage ../tools/games/trigger-control { }; ttchat = callPackage ../tools/misc/ttchat { }; From f571e9d8d33e14d627b55013379d2d550e2ee367 Mon Sep 17 00:00:00 2001 From: wahtique Date: Tue, 27 Jun 2023 21:55:53 +0200 Subject: [PATCH 12/85] teller: init at 1.5.6 --- maintainers/maintainer-list.nix | 9 +++ pkgs/development/tools/teller/default.nix | 68 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 79 insertions(+) create mode 100644 pkgs/development/tools/teller/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b8ff798f2f3d..ccc78c175117 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -17263,6 +17263,15 @@ githubId = 5228243; name = "waelwindows"; }; + wahtique = { + name = "William Veal Phan"; + email = "williamvphan@yahoo.fr"; + github = "wahtique"; + githubId = 55251330; + keys = [{ + fingerprint = "9262 E3A7 D129 C4DD A7C1 26CE 370D D9BE 9121 F0B3"; + }]; + }; waiting-for-dev = { email = "marc@lamarciana.com"; github = "waiting-for-dev"; diff --git a/pkgs/development/tools/teller/default.nix b/pkgs/development/tools/teller/default.nix new file mode 100644 index 000000000000..893077722930 --- /dev/null +++ b/pkgs/development/tools/teller/default.nix @@ -0,0 +1,68 @@ +{ lib, buildGoModule, fetchFromGitHub, nix-update-script }: +let + pname = "teller"; + version = "1.5.6"; + date = "2022-10-13"; +in +buildGoModule { + inherit pname version; + + src = fetchFromGitHub { + owner = "tellerops"; + repo = pname; + rev = "v${version}"; + hash = "sha256-vgrfWKKXf4C4qkbGiB3ndtJy1VyTx2NJs2QiOSFFZkE="; + }; + + vendorHash = null; + + # use make instead of default checks because e2e does not work with `buildGoDir` + checkPhase = '' + runHook preCheck + # We do not set trimpath for tests, in case they reference test assets + export GOFLAGS=''${GOFLAGS//-trimpath/} + + make test + + # e2e tests can fail on first try + + max_iteration=3 + for i in $(seq 1 $max_iteration) + do + make e2e + result=$? + if [[ $result -eq 0 ]] + then + echo "e2e tests passed" + break + else + echo "e2e tests failed, retrying..." + sleep 1 + fi + done + + if [[ $result -ne 0 ]] + then + echo "e2e tests failed after $max_iteration attempts" + fi + + runHook postCheck + ''; + + passthru.updateScript = nix-update-script { }; + + ldflags = [ + "-s" + "-w" + "-X main.version=${version}" + "-X main.commit=${version}" + "-X main.date=${date}" + ]; + + meta = with lib; { + homepage = "https://github.com/tellerops/teller/"; + description = "Cloud native secrets management for developers"; + license = licenses.asl20; + maintainers = with maintainers; [ wahtique ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5282d4968775..8d90682c1dae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17881,6 +17881,8 @@ with pkgs; phpunit = callPackage ../development/tools/misc/phpunit { }; + teller = callPackage ../development/tools/teller { }; + ### DEVELOPMENT / TOOLS / LANGUAGE-SERVERS ansible-language-server = callPackage ../development/tools/language-servers/ansible-language-server { }; From cc34a3d30f9ad3785eb06e0061487c903eca7577 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 Jun 2023 23:34:04 +0200 Subject: [PATCH 13/85] python311Packages.google-cloud-storage: 2.9.0 -> 2.10.0 Changelog: https://github.com/googleapis/python-storage/blob/v2.10.0/CHANGELOG.md --- .../python-modules/google-cloud-storage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-storage/default.nix b/pkgs/development/python-modules/google-cloud-storage/default.nix index 6673c67227ae..490dc1067701 100644 --- a/pkgs/development/python-modules/google-cloud-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-storage/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "google-cloud-storage"; - version = "2.9.0"; + version = "2.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-m2rntQn8KUvay4TQ8+qOIOLFSotLvjnFcHY1/sIU7/M="; + hash = "sha256-k0sx6tXzmU5TYPn/V1CYLFtrEWBNwHK8RSwlll4Hbcc="; }; propagatedBuildInputs = [ From 8b12a04a6c5b7ee7fbb5c6c829c6051daafa882e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 28 Jun 2023 03:07:29 +0000 Subject: [PATCH 14/85] argocd-vault-plugin: 1.14.0 -> 1.15.0 --- pkgs/tools/security/argocd-vault-plugin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/argocd-vault-plugin/default.nix b/pkgs/tools/security/argocd-vault-plugin/default.nix index 0f0901f372fc..297c62681800 100644 --- a/pkgs/tools/security/argocd-vault-plugin/default.nix +++ b/pkgs/tools/security/argocd-vault-plugin/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "argocd-vault-plugin"; - version = "1.14.0"; + version = "1.15.0"; src = fetchFromGitHub { owner = "argoproj-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-TIZpeCYj8i/RbWqYn6js70QtQsnAF0itHCs+2mjwuGg="; + hash = "sha256-59Q6T+k+bFvglhgbydH+GYqcLsZ7EeMTpVa+3EJrZpU="; }; - vendorHash = "sha256-awa3hbM9/9YR7amx/VVOEWgzK/l8OjOemDFpYojfOwg="; + vendorHash = "sha256-n/bRVShxRmaXL3obRdNQ8OVWVZqWZ9qt59gRxGEUtzk="; # integration tests require filesystem and network access for credentials doCheck = false; From 7f966afea20774c61cb5ccd8b67b5a468ca2becf Mon Sep 17 00:00:00 2001 From: eyJhb Date: Wed, 28 Jun 2023 08:16:06 +0200 Subject: [PATCH 15/85] displaylink: removed eyJhb as maintainer --- pkgs/os-specific/linux/displaylink/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/displaylink/default.nix b/pkgs/os-specific/linux/displaylink/default.nix index e8d1ff829e90..cb62fbc7e5ae 100644 --- a/pkgs/os-specific/linux/displaylink/default.nix +++ b/pkgs/os-specific/linux/displaylink/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { description = "DisplayLink DL-5xxx, DL-41xx and DL-3x00 Driver for Linux"; homepage = "https://www.displaylink.com/"; license = licenses.unfree; - maintainers = with maintainers; [ abbradar peterhoeg eyjhb ]; + maintainers = with maintainers; [ abbradar peterhoeg ]; platforms = [ "x86_64-linux" "i686-linux" ]; hydraPlatforms = []; }; From 95aa2a11248fb31368c5fb36ca13d6d46c2ac66e Mon Sep 17 00:00:00 2001 From: eyJhb Date: Wed, 28 Jun 2023 08:16:17 +0200 Subject: [PATCH 16/85] evdi: removed eyJhb as maintainer --- pkgs/os-specific/linux/evdi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix index 18b53e540d11..71ab8bea79e0 100644 --- a/pkgs/os-specific/linux/evdi/default.nix +++ b/pkgs/os-specific/linux/evdi/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Extensible Virtual Display Interface"; - maintainers = with maintainers; [ eyjhb ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; license = with licenses; [ lgpl21Only gpl2Only ]; homepage = "https://www.displaylink.com/"; From e2e6ed5ac25a5d20e54d651ba9431dd21a5a05f3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 28 Jun 2023 06:43:59 +0000 Subject: [PATCH 17/85] denaro: 2023.6.0 -> 2023.6.2 --- pkgs/applications/finance/denaro/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/finance/denaro/default.nix b/pkgs/applications/finance/denaro/default.nix index 38769b6932bd..65d501a9ca36 100644 --- a/pkgs/applications/finance/denaro/default.nix +++ b/pkgs/applications/finance/denaro/default.nix @@ -14,13 +14,13 @@ buildDotnetModule rec { pname = "denaro"; - version = "2023.6.0"; + version = "2023.6.2"; src = fetchFromGitHub { owner = "NickvisionApps"; repo = "Denaro"; rev = version; - hash = "sha256-oLEk3xHDkz98wOMwqr+lLtsFmOJdyPYK1YAutegic7U="; + hash = "sha256-wnqk+UuOQc/Yph9MbQU8FRsNC/8ZQ9FxgF205pdHf+s="; }; dotnet-sdk = dotnetCorePackages.sdk_7_0; From bcabf6bc4a57691ae4dddeda73af1f5bc158dd44 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sun, 4 Jun 2023 23:54:03 -0700 Subject: [PATCH 18/85] libplist: 2.2.0+date=2022-04-05 -> 2.3.0 --- .../libraries/libplist/default.nix | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/libplist/default.nix b/pkgs/development/libraries/libplist/default.nix index 23b1fabce78b..afd28996265c 100644 --- a/pkgs/development/libraries/libplist/default.nix +++ b/pkgs/development/libraries/libplist/default.nix @@ -10,21 +10,17 @@ stdenv.mkDerivation rec { pname = "libplist"; - version = "2.2.0+date=2022-04-05"; + version = "2.3.0"; outputs = [ "bin" "dev" "out" ] ++ lib.optional enablePython "py"; src = fetchFromGitHub { owner = "libimobiledevice"; repo = pname; - rev = "db93bae96d64140230ad050061632531644c46ad"; - hash = "sha256-8e/PFDhsyrOgmI3vLT1YhcROmbJgArDAJSe8Z2bZafo="; + rev = version; + hash = "sha256-fZfDSWVRg73dN+WF6LbgRSj8vtyeKeyjC8pWXFxUmBg="; }; - postPatch = '' - echo '${version}' > .tarball-version - ''; - nativeBuildInputs = [ autoreconfHook pkg-config @@ -35,10 +31,18 @@ stdenv.mkDerivation rec { python3.pkgs.cython ]; - configureFlags = lib.optionals (!enablePython) [ + preAutoreconf = '' + export RELEASE_VERSION=${version} + ''; + + configureFlags = [ + "--enable-debug" + ] ++ lib.optionals (!enablePython) [ "--without-cython" ]; + doCheck = true; + postFixup = lib.optionalString enablePython '' moveToOutput "lib/${python3.libPrefix}" "$py" ''; @@ -49,5 +53,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl21Plus; maintainers = with maintainers; [ infinisil ]; platforms = platforms.unix; + mainProgram = "plistutil"; }; } From a0e56619405b585cacdc4315126a5beebf59db4c Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Mon, 5 Jun 2023 09:58:37 -0700 Subject: [PATCH 19/85] libimobiledevice-glue: 0.pre+date=2022-05-22 -> 1.0.0 --- .../libraries/libimobiledevice-glue/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libimobiledevice-glue/default.nix b/pkgs/development/libraries/libimobiledevice-glue/default.nix index 21daddb7ba3d..5c602a4ee9aa 100644 --- a/pkgs/development/libraries/libimobiledevice-glue/default.nix +++ b/pkgs/development/libraries/libimobiledevice-glue/default.nix @@ -8,15 +8,15 @@ stdenv.mkDerivation rec { pname = "libimobiledevice-glue"; - version = "0.pre+date=2022-05-22"; + version = "1.0.0"; outputs = [ "out" "dev" ]; src = fetchFromGitHub { owner = "libimobiledevice"; repo = pname; - rev = "d2ff7969dcd0a12e4f18f63dab03e6cd03054fcb"; - hash = "sha256-BAdpJK6/iUKCNYLaCJQo0VK63AdIafO8wGbNhnvEc/o="; + rev = version; + hash = "sha256-9TjIYz6w61JaJgOJtWteIDk9bO3NnXp/2ZJwdirFcYM="; }; nativeBuildInputs = [ @@ -28,9 +28,13 @@ stdenv.mkDerivation rec { libplist ]; + preAutoreconf = '' + export RELEASE_VERSION=${version} + ''; + meta = with lib; { homepage = "https://github.com/libimobiledevice/libimobiledevice-glue"; - description = "Library with common code used by the libraries and tools around the libimobiledevice project."; + description = "Library with common code used by the libraries and tools around the libimobiledevice project"; license = licenses.lgpl21Plus; platforms = platforms.unix; maintainers = with maintainers; [ infinisil ]; From 15aa6d820f389935fc2a767aeb1f0de924813fed Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Mon, 5 Jun 2023 10:34:55 -0700 Subject: [PATCH 20/85] libimobiledevice: 1.3.0+date=2022-05-22 -> 1.3.0+date=2023-04-30 --- .../libraries/libimobiledevice/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libimobiledevice/default.nix b/pkgs/development/libraries/libimobiledevice/default.nix index 8ded220678d0..8ce6bc04df89 100644 --- a/pkgs/development/libraries/libimobiledevice/default.nix +++ b/pkgs/development/libraries/libimobiledevice/default.nix @@ -15,21 +15,17 @@ stdenv.mkDerivation rec { pname = "libimobiledevice"; - version = "1.3.0+date=2022-05-22"; + version = "1.3.0+date=2023-04-30"; outputs = [ "out" "dev" ]; src = fetchFromGitHub { owner = "libimobiledevice"; repo = pname; - rev = "12394bc7be588be83c352d7441102072a89dd193"; - hash = "sha256-2K4gZrFnE4hlGlthcKB4n210bTK3+6NY4TYVIoghXJM="; + rev = "860ffb707af3af94467d2ece4ad258dda957c6cd"; + hash = "sha256-mIsB+EaGJlGMOpz3OLrs0nAmhOY1BwMs83saFBaejwc="; }; - postPatch = '' - echo '${version}' > .tarball-version - ''; - nativeBuildInputs = [ autoreconfHook pkg-config @@ -47,6 +43,10 @@ stdenv.mkDerivation rec { CoreFoundation ]; + preAutoreconf = '' + export RELEASE_VERSION=${version} + ''; + configureFlags = [ "--with-gnutls" "--without-cython" ]; meta = with lib; { From 6cf40e09f2b1679fcd950c681fe33c2acf433101 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Mon, 5 Jun 2023 10:41:39 -0700 Subject: [PATCH 21/85] libirecovery: 1.0.0+date=2022-04-04 -> 1.1.0 --- pkgs/development/libraries/libirecovery/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libirecovery/default.nix b/pkgs/development/libraries/libirecovery/default.nix index 1de958dfb3a5..c2a8e16e1d48 100644 --- a/pkgs/development/libraries/libirecovery/default.nix +++ b/pkgs/development/libraries/libirecovery/default.nix @@ -10,15 +10,15 @@ stdenv.mkDerivation rec { pname = "libirecovery"; - version = "1.0.0+date=2022-04-04"; + version = "1.1.0"; outputs = [ "out" "dev" ]; src = fetchFromGitHub { owner = "libimobiledevice"; repo = pname; - rev = "82d235703044c5af9da8ad8f77351fd2046dac47"; - hash = "sha256-OESN9qme+TlSt+ZMbR4F3z/3RN0I12R7fcSyURBqUVk="; + rev = version; + hash = "sha256-84xwSOLwPU2Py6X2r6FYESxdc1EuuD6xHEXTUUEdvTE="; }; nativeBuildInputs = [ @@ -32,6 +32,10 @@ stdenv.mkDerivation rec { libimobiledevice-glue ]; + preAutoreconf = '' + export RELEASE_VERSION=${version} + ''; + # Packager note: Not clear whether this needs a NixOS configuration, # as only the `idevicerestore` binary was tested so far (which worked # without further configuration). From a895c0030e4b42eab71635aed428b8b75f7964a0 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Mon, 5 Jun 2023 10:58:21 -0700 Subject: [PATCH 22/85] usbmuxd: 1.1.1+date=2022-04-04 -> 1.1.1+date=2023-05-05 --- pkgs/tools/misc/usbmuxd/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/usbmuxd/default.nix b/pkgs/tools/misc/usbmuxd/default.nix index 624c818c1f72..2e9c2318081e 100644 --- a/pkgs/tools/misc/usbmuxd/default.nix +++ b/pkgs/tools/misc/usbmuxd/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "usbmuxd"; - version = "1.1.1+date=2022-04-04"; + version = "1.1.1+date=2023-05-05"; src = fetchFromGitHub { owner = "libimobiledevice"; repo = pname; - rev = "2839789bdb581ede7c331b9b4e07e0d5a89d7d18"; - hash = "sha256-wYW6hI0Ti9gKtk/wxIbdY5KaPMs/p+Ve9ceeRqXihQI="; + rev = "01c94c77f59404924f1c46d99c4e5e0c7817281b"; + hash = "sha256-WqbobkzlJ9g5fb9S2QPi3qdpCLx3pxtNlT7qDI63Zp4="; }; nativeBuildInputs = [ @@ -28,6 +28,10 @@ stdenv.mkDerivation rec { libusb1 ]; + preAutoreconf = '' + export RELEASE_VERSION=${version} + ''; + configureFlags = [ "--with-udevrulesdir=${placeholder "out"}/lib/udev/rules.d" "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" From ef923ead41dd2212e48a40ca2ad357ec3a937586 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Mon, 5 Jun 2023 11:03:54 -0700 Subject: [PATCH 23/85] idevicerestore: 1.0.0+date=2022-05-22 -> 1.0.0+date=2023-05-23 --- pkgs/tools/misc/idevicerestore/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/misc/idevicerestore/default.nix b/pkgs/tools/misc/idevicerestore/default.nix index d874d72ec65d..55b2918aa9ba 100644 --- a/pkgs/tools/misc/idevicerestore/default.nix +++ b/pkgs/tools/misc/idevicerestore/default.nix @@ -12,19 +12,15 @@ stdenv.mkDerivation rec { pname = "idevicerestore"; - version = "1.0.0+date=2022-05-22"; + version = "1.0.0+date=2023-05-23"; src = fetchFromGitHub { owner = "libimobiledevice"; repo = pname; - rev = "f80a876b3598de4eb551bafcb279947c527fae33"; - hash = "sha256-I9zZQcZFd0hfeEJM7jltJtVJ6V5C5rA/S8gINiCnJdY="; + rev = "609f7f058487596597e8e742088119fdd46729df"; + hash = "sha256-VXtXAitPC1+pxZlkGBg+u6yYhyM/jVpSgDO/6dXh5V4="; }; - postPatch = '' - echo '${version}' > .tarball-version - ''; - nativeBuildInputs = [ autoreconfHook pkg-config @@ -41,6 +37,10 @@ stdenv.mkDerivation rec { # because they are inherited `libimobiledevice`. ]; + preAutoreconf = '' + export RELEASE_VERSION=${version} + ''; + meta = with lib; { homepage = "https://github.com/libimobiledevice/idevicerestore"; description = "Restore/upgrade firmware of iOS devices"; From 6eb71c7e623ebdfdf66cf22269e68d3ce5034c36 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Mon, 5 Jun 2023 11:11:04 -0700 Subject: [PATCH 24/85] libusbmuxd: 2.0.2+date=2022-05-04 -> 2.0.2+date=2023-04-30 --- pkgs/development/libraries/libusbmuxd/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libusbmuxd/default.nix b/pkgs/development/libraries/libusbmuxd/default.nix index 28cbd8d8561c..5fa18444d0f4 100644 --- a/pkgs/development/libraries/libusbmuxd/default.nix +++ b/pkgs/development/libraries/libusbmuxd/default.nix @@ -9,19 +9,15 @@ stdenv.mkDerivation rec { pname = "libusbmuxd"; - version = "2.0.2+date=2022-05-04"; + version = "2.0.2+date=2023-04-30"; src = fetchFromGitHub { owner = "libimobiledevice"; repo = pname; - rev = "36ffb7ab6e2a7e33bd1b56398a88895b7b8c615a"; - hash = "sha256-41N5cSLAiPJ9FjdnCQnMvPu9/qhI3Je/M1VmKY+yII4="; + rev = "f47c36f5bd2a653a3bd7fb1cf1d2c50b0e6193fb"; + hash = "sha256-ojFnFD0lcdJLP27oFukwzkG5THx1QE+tRBsaMj4ZCc4="; }; - postPatch = '' - echo '${version}' > .tarball-version - ''; - nativeBuildInputs = [ autoreconfHook pkg-config @@ -32,6 +28,10 @@ stdenv.mkDerivation rec { libimobiledevice-glue ]; + preAutoreconf = '' + export RELEASE_VERSION=${version} + ''; + meta = with lib; { description = "A client library to multiplex connections from and to iOS devices"; homepage = "https://github.com/libimobiledevice/libusbmuxd"; From 0dc02fa9bb031c0d6d58709500540c560d62aff1 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Mon, 5 Jun 2023 11:11:29 -0700 Subject: [PATCH 25/85] ideviceinstaller: 1.1.1+date=2022-05-09 -> 1.1.1+date=2023-04-30 --- pkgs/tools/misc/ideviceinstaller/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/ideviceinstaller/default.nix b/pkgs/tools/misc/ideviceinstaller/default.nix index 13cb6584f0a3..c140b9ba1a81 100644 --- a/pkgs/tools/misc/ideviceinstaller/default.nix +++ b/pkgs/tools/misc/ideviceinstaller/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "ideviceinstaller"; - version = "1.1.1+date=2022-05-09"; + version = "1.1.1+date=2023-04-30"; src = fetchFromGitHub { owner = "libimobiledevice"; repo = pname; - rev = "3909271599917bc4a3a996f99bdd3f88c49577fa"; - hash = "sha256-dw3nda2PNddSFPzcx2lv0Nh1KLFXwPBbDBhhwEaB6d0="; + rev = "71ec5eaa30d2780c2614b6b227a2229ea3aeb1e9"; + hash = "sha256-YsQwAlt71vouYJzXl0P7b3fG/MfcwI947GtvN4g3/gM="; }; nativeBuildInputs = [ @@ -30,6 +30,10 @@ stdenv.mkDerivation rec { libzip ]; + preAutoreconf = '' + export RELEASE_VERSION=${version} + ''; + meta = with lib; { homepage = "https://github.com/libimobiledevice/ideviceinstaller"; description = "List/modify installed apps of iOS devices"; From ee759fc899dd372c7191ca30baffa458317a869c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 28 Jun 2023 07:26:01 +0000 Subject: [PATCH 26/85] murex: 4.1.7300 -> 4.2.5110 --- pkgs/shells/murex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/murex/default.nix b/pkgs/shells/murex/default.nix index 5968b26e0c13..519369e28d10 100644 --- a/pkgs/shells/murex/default.nix +++ b/pkgs/shells/murex/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "murex"; - version = "4.1.7300"; + version = "4.2.5110"; src = fetchFromGitHub { owner = "lmorg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wJfkYNoi4pyf8aY/sYuSTcAZm/ck303DmIeMYdnZ2zE="; + sha256 = "sha256-qUnOHnYEzkEQyAn1S2dWXWJIDs0UBtPXIufCzQAtZw8="; }; vendorHash = "sha256-eQfffqNxt6es/3/H59FC5mLn1IU3oMpY/quzgNOgOaU="; From 03f8a481b4cbdabc5d17a943e8663fa7c0c1797d Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Wed, 28 Jun 2023 00:39:06 -0700 Subject: [PATCH 27/85] ios-webkit-debug-proxy: libplist 2.3.0 compatibility --- .../mobile/ios-webkit-debug-proxy/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/mobile/ios-webkit-debug-proxy/default.nix b/pkgs/development/mobile/ios-webkit-debug-proxy/default.nix index b9edbb4cbd4a..4c9a5a4e35e1 100644 --- a/pkgs/development/mobile/ios-webkit-debug-proxy/default.nix +++ b/pkgs/development/mobile/ios-webkit-debug-proxy/default.nix @@ -20,14 +20,19 @@ stdenv.mkDerivation rec { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cZ/p/aWET/BXKDrD+qgR+rfTISd+4jPNQFuV8klSLUo="; + hash = "sha256-cZ/p/aWET/BXKDrD+qgR+rfTISd+4jPNQFuV8klSLUo="; }; patches = [ # OpenSSL 3.0 compatibility (fetchpatch { url = "https://github.com/google/ios-webkit-debug-proxy/commit/5ba30a2a67f39d25025cadf37c0eafb2e2d2d0a8.patch"; - sha256 = "sha256-2b9BjG9wkqO+ZfoBYYJvD2Db5Kr0F/MxKMTRsI0ea3s="; + hash = "sha256-2b9BjG9wkqO+ZfoBYYJvD2Db5Kr0F/MxKMTRsI0ea3s="; + }) + (fetchpatch { + name = "libplist-2.3.0-compatibility.patch"; + url = "https://github.com/google/ios-webkit-debug-proxy/commit/94e4625ea648ece730d33d13224881ab06ad0fce.patch"; + hash = "sha256-2deFAKIcNPDd1loOSe8pWZWs9idIE5Q2+pLkoVQrTLg="; }) # Examples compilation breaks with --disable-static, see https://github.com/google/ios-webkit-debug-proxy/issues/399 ./0001-Don-t-compile-examples.patch @@ -41,10 +46,11 @@ stdenv.mkDerivation rec { preConfigure = '' NOCONFIGURE=1 ./autogen.sh ''; + enableParallelBuilding = true; meta = with lib; { - description = "A DevTools proxy (Chrome Remote Debugging Protocol) for iOS devices (Safari Remote Web Inspector)."; + description = "A DevTools proxy (Chrome Remote Debugging Protocol) for iOS devices (Safari Remote Web Inspector)"; longDescription = '' The ios_webkit_debug_proxy (aka iwdp) proxies requests from usbmuxd daemon over a websocket connection, allowing developers to send commands From 1928cd3026192b2d5bd86e8cc3802c2ba5e92764 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Wed, 28 Jun 2023 00:56:16 -0700 Subject: [PATCH 28/85] usbmuxd2: libplist 2.3.0 compatibility --- pkgs/tools/misc/usbmuxd2/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/usbmuxd2/default.nix b/pkgs/tools/misc/usbmuxd2/default.nix index f4ac629d073c..18014b60371f 100644 --- a/pkgs/tools/misc/usbmuxd2/default.nix +++ b/pkgs/tools/misc/usbmuxd2/default.nix @@ -1,6 +1,7 @@ { lib , clangStdenv , fetchFromGitHub +, fetchpatch , autoreconfHook , pkg-config , libimobiledevice @@ -16,7 +17,7 @@ owner = "tihmstar"; repo = pname; rev = "017d71edb0a12ff4fa01a39d12cd297d8b3d8d34"; - sha256 = "sha256-NrSl/BeKe3wahiYTHGRVSq3PLgQfu76kHCC5ziY7cgQ="; + hash = "sha256-NrSl/BeKe3wahiYTHGRVSq3PLgQfu76kHCC5ziY7cgQ="; }; postPatch = '' # Set package version so we don't require git @@ -46,6 +47,14 @@ clangStdenv.mkDerivation rec { hash = "sha256-T9bt3KOJwFpdPeFuXfBhkBZNaNzix3Q3D47vASR+fVg="; }; + patches = [ + (fetchpatch { + name = "libplist-2.3.0-compatibility.patch"; + url = "https://github.com/tihmstar/usbmuxd2/commit/e527bce2360afc22c95542f1252f94c994f45c72.patch"; + hash = "sha256-ig4j4z2HH8gitXxZYW9fm74Ix9XmJeX2Lz9HBCuDsuk="; + }) + ]; + postPatch = '' # Set package version so we don't require git sed -i '/AC_INIT/s/m4_esyscmd.*/${version})/' configure.ac From 52465f3c0240f84e50e4dedd1e88c46c7134ce7a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 28 Jun 2023 08:22:59 +0000 Subject: [PATCH 29/85] distrobox: 1.5.0.1 -> 1.5.0.2 --- pkgs/applications/virtualization/distrobox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/distrobox/default.nix b/pkgs/applications/virtualization/distrobox/default.nix index 425c45d198e5..fd9e00cb7cb4 100644 --- a/pkgs/applications/virtualization/distrobox/default.nix +++ b/pkgs/applications/virtualization/distrobox/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "distrobox"; - version = "1.5.0.1"; + version = "1.5.0.2"; src = fetchFromGitHub { owner = "89luca89"; repo = pname; rev = version; - sha256 = "sha256-e8uOvIPeAB0fVDhBl2YnaVGpmDdgPkdqVhAHKFXrMyY="; + sha256 = "sha256-ss8049D6n1V/gDzEMjywDnoke5s2we9j3mO8yta72UA="; }; dontConfigure = true; From 9af2cd6fb94e0e38bc65c8be216a7dc869643380 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Wed, 28 Jun 2023 01:24:17 -0700 Subject: [PATCH 30/85] libgpod: libplist 2.3.0 compatibility --- pkgs/development/libraries/libgpod/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libgpod/default.nix b/pkgs/development/libraries/libgpod/default.nix index 590aaf27c5f0..a34b108a0a5a 100644 --- a/pkgs/development/libraries/libgpod/default.nix +++ b/pkgs/development/libraries/libgpod/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, fetchpatch , perlPackages , intltool , autoreconfHook @@ -24,11 +25,19 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/gtkpod/libgpod-${version}.tar.bz2"; - sha256 = "0pcmgv1ra0ymv73mlj4qxzgyir026z9jpl5s5bkg35afs1cpk2k3"; + hash = "sha256-Y4p5WdBOlfHmKrrQK9M3AuTo3++YSFrH2dUDlcN+lV0="; }; outputs = [ "out" "dev" ]; + patches = [ + (fetchpatch { + name = "libplist-2.3.0-compatibility.patch"; + url = "https://sourceforge.net/p/gtkpod/patches/48/attachment/libplist-2.3.0-compatibility.patch"; + hash = "sha256-aVkuYE1N/jdEhVhiXEVhApvOC+8csIMMpP20rAJwEVQ="; + }) + ]; + postPatch = '' # support libplist 2.2 substituteInPlace configure.ac --replace 'libplist >= 1.0' 'libplist-2.0 >= 2.2' From ce7602dbd2ec6d9c54be0fb04ab1ba2d7e9af958 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 28 Jun 2023 13:40:39 +0000 Subject: [PATCH 31/85] flacon: 11.1.0 -> 11.2.0 --- pkgs/applications/audio/flacon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/flacon/default.nix b/pkgs/applications/audio/flacon/default.nix index 7bf9d7fb918f..bc92fa096b09 100644 --- a/pkgs/applications/audio/flacon/default.nix +++ b/pkgs/applications/audio/flacon/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "flacon"; - version = "11.1.0"; + version = "11.2.0"; src = fetchFromGitHub { owner = "flacon"; repo = "flacon"; rev = "v${version}"; - sha256 = "sha256-nAJKTRkx8d53v1tPnu5ARrRoESKh4jUOCcD54bhE8TU="; + sha256 = "sha256-pDTBA9HpFzwagz9B5AmaHzML361ON3XA+OIZJQyAuJo="; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; From dd96e7a2d7d438938011f38788c649278eaed2c3 Mon Sep 17 00:00:00 2001 From: networkException Date: Wed, 28 Jun 2023 13:23:23 +0200 Subject: [PATCH 32/85] ungoogled-chromium: 114.0.5735.133 -> 114.0.5735.198 https://chromereleases.googleblog.com/2023/06/stable-channel-update-for-desktop_26.html This update includes 4 security fixes. CVEs: CVE-2023-3420 CVE-2023-3421 CVE-2023-3422 --- .../networking/browsers/chromium/upstream-info.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 31cea2d08709..a75d81cdfcd3 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -45,9 +45,9 @@ } }, "ungoogled-chromium": { - "version": "114.0.5735.133", - "sha256": "0qnj4gr4b9gmla1hbz1ir64hfmpc45vzkg0hmw9h6m72r4gfr2c2", - "sha256bin64": "0gk9l1xspbqdxv9q16zdcrrr6bxx677cnz7vv4pgg85k1pwhyw3g", + "version": "114.0.5735.198", + "sha256": "1shxlkass3s744mwc571cyzlb9cc8lxvi5wp35mzaldbxq7l9wx9", + "sha256bin64": "0367sks2z7xj130bszimznkjjimfdimknd7qzi68335y9qzl1y92", "deps": { "gn": { "version": "2023-04-19", @@ -56,8 +56,8 @@ "sha256": "01xrh9m9m6x8lz0vxwdw2mrhrvnw93zpg09hwdhqakj06agf4jjk" }, "ungoogled-patches": { - "rev": "114.0.5735.133-1", - "sha256": "1i9ql4b2rn9jryyc3hfr9kh8ccf5a4gvpwsp9lnp9jc2gryrv70y" + "rev": "114.0.5735.198-1", + "sha256": "1zda5c7n43zviwj3n2r2zbhmylkrfy54hggq8cisbdrhhfn96vii" } } } From 625a1992ca5f368fdb2310a46115f1aa8800a5c3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 28 Jun 2023 15:18:38 +0000 Subject: [PATCH 33/85] prometheus-mysqld-exporter: 0.14.0 -> 0.15.0 --- pkgs/servers/monitoring/prometheus/mysqld-exporter.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix index 2a546672ec7b..f0d2ac078274 100644 --- a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mysqld_exporter"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "prometheus"; repo = "mysqld_exporter"; rev = "v${version}"; - sha256 = "sha256-SMcpQNygv/jVLNuQP8V6BH/CmSt5Y4dzYPsboTH2dos="; + sha256 = "sha256-LW9vH//TjnKbZGMF3owDSUx/Mu0TUuWxMtmdeKM/q7k="; }; - vendorSha256 = "sha256-M6u+ZBEUqCd6cKVHPvHqRiXLbuWz66GK+ybIQm+5tQE="; + vendorHash = "sha256-8zoiYSW8/z1Ch5W1WJHbWAPKFUOhUT8YcjrvyhwI+8w="; ldflags = let t = "github.com/prometheus/common/version"; in [ "-s" "-w" From c04671ec9003305b72d35b679129b6b88bd21a32 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 28 Jun 2023 15:48:08 +0000 Subject: [PATCH 34/85] entt: 3.11.1 -> 3.12.2 --- pkgs/development/libraries/entt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/entt/default.nix b/pkgs/development/libraries/entt/default.nix index c52d327c611a..44e0b9ed1f05 100644 --- a/pkgs/development/libraries/entt/default.nix +++ b/pkgs/development/libraries/entt/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "entt"; - version = "3.11.1"; + version = "3.12.2"; src = fetchFromGitHub { owner = "skypjack"; repo = "entt"; rev = "v${version}"; - sha256 = "sha256-/ZvMyhvnlu/5z4UHhPe8WMXmSA45Kjbr6bRqyVJH310="; + sha256 = "sha256-gzoea3IbmpkIZYrfTZA6YgcnDU5EKdXF5Y7Yz2Uaj4A="; }; nativeBuildInputs = [ cmake ]; From 17a6a01136c26d031c13d9e1e61c4bf646e018f1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 28 Jun 2023 16:46:38 +0000 Subject: [PATCH 35/85] temporal: 1.20.3 -> 1.21.0 --- pkgs/applications/networking/cluster/temporal/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/temporal/default.nix b/pkgs/applications/networking/cluster/temporal/default.nix index b09e9d0c4e95..44ba2491588b 100644 --- a/pkgs/applications/networking/cluster/temporal/default.nix +++ b/pkgs/applications/networking/cluster/temporal/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "temporal"; - version = "1.20.3"; + version = "1.21.0"; src = fetchFromGitHub { owner = "temporalio"; repo = "temporal"; rev = "v${version}"; - hash = "sha256-ej6k9zQNpQ4x1LxZCI5vst9P1bSLEtbVkz1HUIX46cA="; + hash = "sha256-PhJLO+0JoSGS/aN6ZZoCwSypm8hihwAjsav+l4NSNZo="; }; - vendorHash = "sha256-Fo/xePou96KdFlUNIqhDZX4TJoYXqlMyuLDvmR/XreY="; + vendorHash = "sha256-rgUdoFR7Qcp1h7v63DAWwx6NWSwWrJ6C6/b2tx2kCCw="; excludedPackages = [ "./build" ]; From eca5d29240ca4bf7317b0d5c3e84f77975b9ac80 Mon Sep 17 00:00:00 2001 From: Isa Date: Wed, 28 Jun 2023 18:52:05 +0200 Subject: [PATCH 36/85] graylog: 5.0.7 -> 5.0.8 --- pkgs/tools/misc/graylog/5.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/graylog/5.0.nix b/pkgs/tools/misc/graylog/5.0.nix index 2109dce74427..40b296010cd4 100644 --- a/pkgs/tools/misc/graylog/5.0.nix +++ b/pkgs/tools/misc/graylog/5.0.nix @@ -2,8 +2,8 @@ let buildGraylog = callPackage ./graylog.nix {}; in buildGraylog { - version = "5.0.7"; - sha256 = "sha256-wGw7j1vBa0xcoyfrK7xlLGKElF1SV2ijn+uQ8COj87Y="; + version = "5.0.8"; + sha256 = "sha256-TGJm2PGoXaLhlzyfSWKScEJxEGObTVttpEEaczsXHiA="; maintainers = [ lib.maintainers.f2k1de ]; license = lib.licenses.sspl; } From 4ce75cd86102dd37a674fdef50510173e7c2d618 Mon Sep 17 00:00:00 2001 From: Hraban Luyat Date: Wed, 28 Jun 2023 13:27:23 -0400 Subject: [PATCH 37/85] sbcl: 2.3.5 -> 2.3.6 --- pkgs/development/compilers/sbcl/2.x.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/compilers/sbcl/2.x.nix b/pkgs/development/compilers/sbcl/2.x.nix index 9e803e6306ce..493186389f5e 100644 --- a/pkgs/development/compilers/sbcl/2.x.nix +++ b/pkgs/development/compilers/sbcl/2.x.nix @@ -22,13 +22,13 @@ let # The loosely held nixpkgs convention for SBCL is to keep the last two # versions. # https://github.com/NixOS/nixpkgs/pull/200994#issuecomment-1315042841 - "2.3.4" = { - sha256 = "sha256-8RtHZMbqvbJ+WpxGshcgTRG82lNOc7+XBz1Xgx0gnE4="; - }; - "2.3.5" = { sha256 = "sha256-ickHIM+dBdvNkNaQ44GiUUwPGAcVng1yIiIMWowtUYY="; }; + + "2.3.6" = { + sha256 = "sha256-tEFMpNmnR06NiE19YyN+LynvRZ39WoSEJKnD+lUdGbk="; + }; }; in with versionMap.${version}; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b76008454409..e34f10c337a4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25376,17 +25376,17 @@ with pkgs; pkg = callPackage ../development/compilers/sbcl/bootstrap.nix {}; faslExt = "fasl"; }; - sbcl_2_3_4 = wrapLisp { - pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.3.4"; }; - faslExt = "fasl"; - flags = [ "--dynamic-space-size" "3000" ]; - }; sbcl_2_3_5 = wrapLisp { pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.3.5"; }; faslExt = "fasl"; flags = [ "--dynamic-space-size" "3000" ]; }; - sbcl = sbcl_2_3_5; + sbcl_2_3_6 = wrapLisp { + pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.3.6"; }; + faslExt = "fasl"; + flags = [ "--dynamic-space-size" "3000" ]; + }; + sbcl = sbcl_2_3_6; sbclPackages = recurseIntoAttrs sbcl.pkgs; From 9abe1bb6824bf6d70f03ed91d8e6003c52f6457b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 28 Jun 2023 21:10:03 +0200 Subject: [PATCH 38/85] linux: 4.14.319 -> 4.14.320 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index a41e15e863df..5d759c36acfe 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.319"; + version = "4.14.320"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1y8zp9jkyid4g857nfm7xhsya3d9vx2dni8l7ishn2gl087pb95c"; + sha256 = "09bn18jvazkc55bqdjbxy8fbca7vjhi9xl2h02w0sq3f1jf6g0pd"; }; } // (args.argsOverride or {})) From 2e27cec09322fc5e79c514adc2a32c22d4913e3b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 28 Jun 2023 21:10:10 +0200 Subject: [PATCH 39/85] linux: 4.19.287 -> 4.19.288 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 147c8f1396f7..47c8cc9cbe05 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.287"; + version = "4.19.288"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0wracrahi4qm6klsd9bnlwwdcaqbclx2mqc5d7vbvxxzfn69nsi8"; + sha256 = "1sz3jp6kx0axdwp0wsq903q1090rbav9d12m5128335m8p2d1srk"; }; } // (args.argsOverride or {})) From 52f402477b6964b113ac30bd121aaadb7f1a321c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 28 Jun 2023 21:10:15 +0200 Subject: [PATCH 40/85] linux: 5.10.185 -> 5.10.186 --- pkgs/os-specific/linux/kernel/linux-5.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index a94a85fd02a3..f550778eac90 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.185"; + version = "5.10.186"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "143hghmj4lxiyavndvdmwg5mig8s2i4ffrmd8zwqqwy8ipn641i8"; + sha256 = "1qqv91r13akgik1q4jybf8czskxxizk6lpv4rsvjn9sx2dm2jq0y"; }; } // (args.argsOverride or {})) From 624ea64be10ab8bc7ca81612b7cd4be5192e6130 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 28 Jun 2023 21:10:23 +0200 Subject: [PATCH 41/85] linux: 5.15.118 -> 5.15.119 --- pkgs/os-specific/linux/kernel/linux-5.15.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index c25fdecffa37..2eb629ab6446 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.118"; + version = "5.15.119"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1cxm7s19l2f38chxrlvx7crvqcygmc77rhsc3lfx3m84vgdg8ssf"; + sha256 = "1kygpqf6sgkrwg77sv01di23c3n3rn5d44g8k5apx5106pys19bs"; }; } // (args.argsOverride or { })) From 540219fde7a27f67988de9b1d7ff08301b0cf73b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 28 Jun 2023 21:10:29 +0200 Subject: [PATCH 42/85] linux: 5.4.248 -> 5.4.249 --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index c5d708ff6d99..99205ad33962 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.248"; + version = "5.4.249"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0d9yn51rg59k39h0w6wmvjqz9n7najm9x8yb79rparbcwwrd3gis"; + sha256 = "079mylc5j7hk5xn59q3z2xydyh88pq7yipn67x3y7nvf5i35hm6w"; }; } // (args.argsOverride or {})) From 5c5284f1a247b9c60434635268a94dab022d3c79 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 28 Jun 2023 21:10:35 +0200 Subject: [PATCH 43/85] linux: 6.1.35 -> 6.1.36 --- pkgs/os-specific/linux/kernel/linux-6.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-6.1.nix b/pkgs/os-specific/linux/kernel/linux-6.1.nix index b3d7132ca905..0d14248c5fe1 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.1.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.1.35"; + version = "6.1.36"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "1b16pk0b45k1q53nzbwv6wh0aqn160b1kip8scywf3axpi1q2dmy"; + sha256 = "0szyiah4avicqvlmadjxyh3i9b0xi9ipqjg1qrqgzf9h1wq0xjnq"; }; } // (args.argsOverride or { })) From c94a1a1f2708c9c5d289d64664e70e3b4903ae8b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 28 Jun 2023 21:10:41 +0200 Subject: [PATCH 44/85] linux: 6.3.9 -> 6.3.10 --- pkgs/os-specific/linux/kernel/linux-6.3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-6.3.nix b/pkgs/os-specific/linux/kernel/linux-6.3.nix index e6778222b004..9a5d1ad8e5c4 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.3.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.3.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.3.9"; + version = "6.3.10"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "0gmi55hhdw1f1qyvd04v17x596yh8wis42vmcd8vhymik49z5v21"; + sha256 = "1qs6rmh0hk47rmz30fhjj3g7bqrz19w1ldyv6fyiq6djja3avag0"; }; } // (args.argsOverride or { })) From bd33b62b991bb9517c049f2d2ae8d14020033f70 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 28 Jun 2023 21:11:42 +0200 Subject: [PATCH 45/85] linux/hardened/patches/4.14: 4.14.317-hardened1 -> 4.14.319-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 48cf3595dbc1..5c849d5b8e06 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -2,12 +2,12 @@ "4.14": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.14.317-hardened1.patch", - "sha256": "11jfmfanziq1k96147ddsavs1jaf201gsxpfm9i2qkz6jqrmqrsn", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.317-hardened1/linux-hardened-4.14.317-hardened1.patch" + "name": "linux-hardened-4.14.319-hardened1.patch", + "sha256": "1dz59az2k1lg5csx70p4nb634cv57b7ij554hkvln7bp6m9cm1ga", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.319-hardened1/linux-hardened-4.14.319-hardened1.patch" }, - "sha256": "0c1wy0m0jnjpc6scrw1y97wsg2d18vb1bi31i1qzlxvgmrd8zwlc", - "version": "4.14.317" + "sha256": "1y8zp9jkyid4g857nfm7xhsya3d9vx2dni8l7ishn2gl087pb95c", + "version": "4.14.319" }, "4.19": { "patch": { From ead6ae067d94f0994dcaa7853d95aab1128f36f1 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 28 Jun 2023 21:12:34 +0200 Subject: [PATCH 46/85] linux/hardened/patches/4.19: 4.19.285-hardened1 -> 4.19.287-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 5c849d5b8e06..a5e7b696d7c8 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -12,12 +12,12 @@ "4.19": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.19.285-hardened1.patch", - "sha256": "183q8c6jxss5q9vp1vvi3l233s0jf0lbn5sylavwzgdjm5anbjdr", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.285-hardened1/linux-hardened-4.19.285-hardened1.patch" + "name": "linux-hardened-4.19.287-hardened1.patch", + "sha256": "1my4j6i549xw2zzbxnbaarby7584ysy4l1xgw3x8cc848l2m1iqp", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.287-hardened1/linux-hardened-4.19.287-hardened1.patch" }, - "sha256": "05nwivdk4w939vrrbn5p2yai1rz7kxqa4bl5f3n6d867b59pg8da", - "version": "4.19.285" + "sha256": "0wracrahi4qm6klsd9bnlwwdcaqbclx2mqc5d7vbvxxzfn69nsi8", + "version": "4.19.287" }, "5.10": { "patch": { From 15cf6dd4e39e83887f452dcc9f5ff14a90aa4db0 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 28 Jun 2023 21:13:00 +0200 Subject: [PATCH 47/85] linux/hardened/patches/5.10: 5.10.183-hardened1 -> 5.10.185-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index a5e7b696d7c8..5e9f3787dd8d 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -22,12 +22,12 @@ "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.10.183-hardened1.patch", - "sha256": "13rpr4bgvm6zi7vpf2syxbixgbzcyqz774xil4ffyzi8zqcnbz8s", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.183-hardened1/linux-hardened-5.10.183-hardened1.patch" + "name": "linux-hardened-5.10.185-hardened1.patch", + "sha256": "05abqsbsr6mjj0yxwwwf2hwsxd3z3jj2wkj0frd1ygb06njkvpjz", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.185-hardened1/linux-hardened-5.10.185-hardened1.patch" }, - "sha256": "06b1nlwaqs7g3323zxp1bxfilqpbj700x591vqa9dx6a6p39g520", - "version": "5.10.183" + "sha256": "143hghmj4lxiyavndvdmwg5mig8s2i4ffrmd8zwqqwy8ipn641i8", + "version": "5.10.185" }, "5.15": { "patch": { From 8346a0e03c962a52625b9c89ecd673464877cfb7 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 28 Jun 2023 21:14:03 +0200 Subject: [PATCH 48/85] linux/hardened/patches/5.15: 5.15.116-hardened1 -> 5.15.118-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 5e9f3787dd8d..c165ea909f4f 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -32,12 +32,12 @@ "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.15.116-hardened1.patch", - "sha256": "0bg4yjix7n22r2q97rcrc5svggkczap98ljq3b11688nfjnxbgbp", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.116-hardened1/linux-hardened-5.15.116-hardened1.patch" + "name": "linux-hardened-5.15.118-hardened1.patch", + "sha256": "07knyxmb0j2bf117md2glyyqj892n4p4jq2ahd8s90fp0x8g6z9a", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.118-hardened1/linux-hardened-5.15.118-hardened1.patch" }, - "sha256": "16hpdqlkz2g2pjcml7j55yfym6nbp0zg8f2r969wq9jkpg8wj5zn", - "version": "5.15.116" + "sha256": "1cxm7s19l2f38chxrlvx7crvqcygmc77rhsc3lfx3m84vgdg8ssf", + "version": "5.15.118" }, "5.4": { "patch": { From 8af3229fca60ba300aae88c8e195523a05f0827a Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 28 Jun 2023 21:14:56 +0200 Subject: [PATCH 49/85] linux/hardened/patches/5.4: 5.4.246-hardened1 -> 5.4.248-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index c165ea909f4f..443939f9eab3 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -42,12 +42,12 @@ "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.4.246-hardened1.patch", - "sha256": "07i8g34r9f6fjnx8bxikydik42s5nyp95q6rfl3rq48q418jd766", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.246-hardened1/linux-hardened-5.4.246-hardened1.patch" + "name": "linux-hardened-5.4.248-hardened1.patch", + "sha256": "0zd1s6xxpv6j2hmm56x4pg9dxakrmkf29x3vv6pjq3hmcp8ihs4s", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.248-hardened1/linux-hardened-5.4.248-hardened1.patch" }, - "sha256": "1snrgvpqpmc0d4aphq8flsmlcjjx9kgknymjlrmazl4ghl57jf09", - "version": "5.4.246" + "sha256": "0d9yn51rg59k39h0w6wmvjqz9n7najm9x8yb79rparbcwwrd3gis", + "version": "5.4.248" }, "6.1": { "patch": { From 469e88115c85de122a921281bae77734766d1337 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 28 Jun 2023 21:15:03 +0200 Subject: [PATCH 50/85] linux/hardened/patches/6.1: 6.1.33-hardened1 -> 6.1.35-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 443939f9eab3..81623497aaa1 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -52,11 +52,11 @@ "6.1": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-6.1.33-hardened1.patch", - "sha256": "1mfimfs9v6a852vrpckr9v0hlbqy34c3lj5fj50m7m8x25qsin5a", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.33-hardened1/linux-hardened-6.1.33-hardened1.patch" + "name": "linux-hardened-6.1.35-hardened1.patch", + "sha256": "0s9ld5dnzxyizm8bdv4dc8lh3yfqv45hd65k0sc4swlnb1k96dxb", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.35-hardened1/linux-hardened-6.1.35-hardened1.patch" }, - "sha256": "1kfj7mi3n2lfaw4spz5cbvcl1md038figabyg80fha3kxal6nzdq", - "version": "6.1.33" + "sha256": "1b16pk0b45k1q53nzbwv6wh0aqn160b1kip8scywf3axpi1q2dmy", + "version": "6.1.35" } } From 325188d713c6a45049e472a9f860ce76f6878358 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 28 Jun 2023 21:15:15 +0200 Subject: [PATCH 51/85] linux/hardened/patches/6.3: init at 6.3.1-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 81623497aaa1..cc093f220046 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -58,5 +58,15 @@ }, "sha256": "1b16pk0b45k1q53nzbwv6wh0aqn160b1kip8scywf3axpi1q2dmy", "version": "6.1.35" + }, + "6.3": { + "patch": { + "extra": "-hardened1", + "name": "linux-hardened-6.3.1-hardened1.patch", + "sha256": "0wlp6azlkj9xbkwxyari28ixini0jvw2dl653i7ns4l27p0gmayx", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.3.1-hardened1/linux-hardened-6.3.1-hardened1.patch" + }, + "sha256": "0aizkgwdmdjrgab67yjfaqcmvfh7wb3b3mdq9qfxpq6mlys0yqkq", + "version": "6.3.1" } } From f193e0b8207e36fb3c6cc647fd441c11c6d22b98 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 28 Jun 2023 21:19:26 +0200 Subject: [PATCH 52/85] linux_5_15: apply patch to fix amdgpu Closes #240017 --- pkgs/os-specific/linux/kernel/patches.nix | 8 ++++++++ pkgs/top-level/linux-kernels.nix | 1 + 2 files changed, 9 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 972235c7f852..2b46be2199a8 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -66,4 +66,12 @@ hash = "sha256-DYPWgraXPNeFkjtuDYkFXHnCJ4yDewrukM2CCAqC2BE="; }; }; + + fix-amdgpu-5_15 = { + name = "fix-amdgpu-crash"; + patch = fetchpatch { + url = "https://lore.kernel.org/stable/20230628111636.23300-1-mario.limonciello@amd.com/raw"; + sha256 = "sha256-eAzy+bMiOJwzssOuvrMu7gmmV3PZezaDuVwwx7zNt6M="; + }; + }; } diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index fea9eea010be..d2ea00125a7c 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -150,6 +150,7 @@ in { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper + kernelPatches.fix-amdgpu-5_15 ]; }; From c1ecfffb818e213c8008db82c27ee079ceebd0c5 Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Wed, 28 Jun 2023 15:22:18 -0400 Subject: [PATCH 53/85] brave: 1.52.126 -> 1.52.129 https://community.brave.com/t/release-channel-1-52-129/494007/1 --- pkgs/applications/networking/browsers/brave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index d234a1f65316..575c0c48dec2 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -90,11 +90,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.52.126"; + version = "1.52.129"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "sha256-M/25YFqET4G89S7ihiFige047+fk/jWKpEiD8O22W74="; + sha256 = "sha256-v5C8YbYv2gr2Tf+koM3+4s2xtHTabLcJcIlsQx3UxfM="; }; dontConfigure = true; From 0b4e493e58bf92b9784f5c0d562489364d0733e7 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 28 Jun 2023 21:23:00 +0200 Subject: [PATCH 54/85] linux_6_3_hardened: expose package --- nixos/tests/kernel-generic.nix | 1 + pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/linux-kernels.nix | 2 ++ 3 files changed, 5 insertions(+) diff --git a/nixos/tests/kernel-generic.nix b/nixos/tests/kernel-generic.nix index 3e74554de339..82d9118c6fb1 100644 --- a/nixos/tests/kernel-generic.nix +++ b/nixos/tests/kernel-generic.nix @@ -31,6 +31,7 @@ let linux_5_10_hardened linux_5_15_hardened linux_6_1_hardened + linux_6_3_hardened linux_testing; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 893605c0bfcc..7696f660ac93 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27449,6 +27449,8 @@ with pkgs; linux_5_15_hardened = linuxKernel.kernels.linux_5_15_hardened; linuxPackages_6_1_hardened = linuxKernel.packages.linux_6_1_hardened; linux_6_1_hardened = linuxKernel.kernels.linux_6_1_hardened; + linuxPackages_6_3_hardened = linuxKernel.packages.linux_6_3_hardened; + linux_6_3_hardened = linuxKernel.kernels.linux_6_3_hardened; # Hardkernel (Odroid) kernels. linuxPackages_hardkernel_latest = linuxKernel.packageAliases.linux_hardkernel_latest; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index d2ea00125a7c..3f448f4cdeb0 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -276,6 +276,7 @@ in { linux_5_10_hardened = hardenedKernelFor kernels.linux_5_10 { }; linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { }; linux_6_1_hardened = hardenedKernelFor kernels.linux_6_1 { }; + linux_6_3_hardened = hardenedKernelFor kernels.linux_6_3 { }; } // lib.optionalAttrs config.allowAliases { linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11"; @@ -622,6 +623,7 @@ in { linux_5_10_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_10_hardened); linux_5_15_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_15_hardened); linux_6_1_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_1_hardened); + linux_6_3_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_3_hardened); linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen); linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx); From 3456657a947a132ab71143c59d89c99aeec85aa4 Mon Sep 17 00:00:00 2001 From: Isa Date: Mon, 22 May 2023 18:51:03 +0200 Subject: [PATCH 55/85] webalizer: 2.23-05 -> 2.23.08 Update version and replace mirror, because previously used mirror is unavailable --- pkgs/tools/networking/webalizer/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/webalizer/default.nix b/pkgs/tools/networking/webalizer/default.nix index 4c2354b5f7fb..c8945fa454aa 100644 --- a/pkgs/tools/networking/webalizer/default.nix +++ b/pkgs/tools/networking/webalizer/default.nix @@ -2,24 +2,26 @@ stdenv.mkDerivation rec { pname = "webalizer"; - version = "2.23-05"; + version = "2.23.08"; src = fetchurl { - url = "ftp://ftp.mrunix.net/pub/webalizer/webalizer-${version}-src.tar.bz2"; - sha256 = "0nl88y57a7gawfragj3viiigfkh5sgivfb4n0k89wzcjw278pj5g"; + url = "https://ftp.debian.org/debian/pool/main/w/webalizer/webalizer_${version}.orig.tar.gz"; + sha256 = "sha256-7a3bWqQcxKCBoVAOP6lmFdS0G8Eghrzt+ZOAGM557Y0="; }; # Workaround build failure on -fno-common toolchains: # ld: dns_resolv.o:(.bss+0x20): multiple definition of `system_info'; webalizer.o:(.bss+0x76e0): first defined here env.NIX_CFLAGS_COMPILE = "-fcommon"; + installFlags = [ "MANDIR=\${out}/share/man/man1" ]; + preConfigure = '' substituteInPlace ./configure \ --replace "--static" "" ''; - buildInputs = [zlib libpng gd geoip db]; + buildInputs = [ zlib libpng gd geoip db ]; configureFlags = [ "--enable-dns" From 28fb612abc4fcc7e5c460c8e94dc03fb748b3e13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Reyrol?= Date: Wed, 28 Jun 2023 20:55:46 +0200 Subject: [PATCH 56/85] prometheus-php-fpm-exporter: init at 2.2.0 --- .../prometheus/php-fpm-exporter.nix | 59 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 60 insertions(+) create mode 100644 pkgs/servers/monitoring/prometheus/php-fpm-exporter.nix diff --git a/pkgs/servers/monitoring/prometheus/php-fpm-exporter.nix b/pkgs/servers/monitoring/prometheus/php-fpm-exporter.nix new file mode 100644 index 000000000000..e9ba97d1f3f7 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/php-fpm-exporter.nix @@ -0,0 +1,59 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, makeWrapper +, installShellFiles +, getent +, nix-update-script +, testers +, prometheus-php-fpm-exporter +}: + +buildGoModule rec { + pname = "php-fpm_exporter"; + version = "2.2.0"; + + src = fetchFromGitHub { + owner = "hipages"; + repo = pname; + rev = "v${version}"; + hash = "sha256-ggrFnyEdGBoZVh4dHMw+7RUm8nJ1hJXo/fownO3wvzE="; + }; + + vendorHash = "sha256-OK36tHkBtosdfEWFPYMtlbzCkh5cF35NBWYyJrb9fwg= "; + + nativeBuildInputs = [ makeWrapper installShellFiles ]; + + ldflags = [ + "-X main.version=${version}" + ]; + + preFixup = '' + wrapProgram "$out/bin/php-fpm_exporter" \ + --prefix PATH ":" "${lib.makeBinPath [ getent ]}" + ''; + + postInstall = '' + installShellCompletion --cmd php-fpm_exporter \ + --bash <($out/bin/php-fpm_exporter completion bash) \ + --fish <($out/bin/php-fpm_exporter completion fish) \ + --zsh <($out/bin/php-fpm_exporter completion zsh) + ''; + + passthru = { + updateScript = nix-update-script { }; + tests = testers.testVersion { + inherit version; + package = prometheus-php-fpm-exporter; + command = "php-fpm_exporter version"; + }; + }; + + meta = with lib; { + homepage = "https://github.com/hipages/php-fpm_exporter"; + description = "A prometheus exporter for PHP-FPM."; + license = licenses.asl20; + maintainers = with maintainers; [ gaelreyrol ]; + mainProgram = "php-fpm_exporter"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 84869bc10e39..75e001c7e5b6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26483,6 +26483,7 @@ with pkgs; prometheus-nut-exporter = callPackage ../servers/monitoring/prometheus/nut-exporter.nix { }; prometheus-openldap-exporter = callPackage ../servers/monitoring/prometheus/openldap-exporter.nix { } ; prometheus-openvpn-exporter = callPackage ../servers/monitoring/prometheus/openvpn-exporter.nix { }; + prometheus-php-fpm-exporter = callPackage ../servers/monitoring/prometheus/php-fpm-exporter.nix { }; prometheus-pihole-exporter = callPackage ../servers/monitoring/prometheus/pihole-exporter.nix { }; prometheus-postfix-exporter = callPackage ../servers/monitoring/prometheus/postfix-exporter.nix { }; prometheus-postgres-exporter = callPackage ../servers/monitoring/prometheus/postgres-exporter.nix { }; From 1a821e7bf5254d84679273dd2f2e8f74f958d871 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Reyrol?= Date: Wed, 28 Jun 2023 20:57:01 +0200 Subject: [PATCH 57/85] nixos/prometheus-exporters: add php-fpm --- .../monitoring/prometheus/exporters.nix | 1 + .../prometheus/exporters/php-fpm.nix | 65 +++++++++++++++++++ nixos/tests/prometheus-exporters.nix | 43 +++++++++++- 3 files changed, 108 insertions(+), 1 deletion(-) create mode 100644 nixos/modules/services/monitoring/prometheus/exporters/php-fpm.nix diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index 46bf7548e95e..9e3109dc0cbd 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -56,6 +56,7 @@ let "nut" "openldap" "openvpn" + "php-fpm" "pihole" "postfix" "postgres" diff --git a/nixos/modules/services/monitoring/prometheus/exporters/php-fpm.nix b/nixos/modules/services/monitoring/prometheus/exporters/php-fpm.nix new file mode 100644 index 000000000000..8f6942002f79 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/php-fpm.nix @@ -0,0 +1,65 @@ +{ config +, lib +, pkgs +, options +}: + +let + logPrefix = "services.prometheus.exporter.php-fpm"; + cfg = config.services.prometheus.exporters.php-fpm; +in { + port = 9253; + extraOpts = { + package = lib.mkPackageOptionMD pkgs "prometheus-php-fpm-exporter" {}; + + telemetryPath = lib.mkOption { + type = lib.types.str; + default = "/metrics"; + description = lib.mdDoc '' + Path under which to expose metrics. + ''; + }; + + environmentFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = null; + example = "/root/prometheus-php-fpm-exporter.env"; + description = lib.mdDoc '' + Environment file as defined in {manpage}`systemd.exec(5)`. + + Secrets may be passed to the service without adding them to the + world-readable Nix store, by specifying placeholder variables as + the option value in Nix and setting these variables accordingly in the + environment file. + + Environment variables from this file will be interpolated into the + config file using envsubst with this syntax: + `$ENVIRONMENT ''${VARIABLE}` + + For variables to use see [options and defaults](https://github.com/hipages/php-fpm_exporter#options-and-defaults). + + The main use is to set the PHP_FPM_SCRAPE_URI that indicate how to connect to PHP-FPM process. + + ``` + # Content of the environment file + PHP_FPM_SCRAPE_URI="unix:///tmp/php.sock;/status" + ``` + + Note that this file needs to be available on the host on which + this exporter is running. + ''; + }; + }; + + serviceOpts = { + serviceConfig = { + EnvironmentFile = lib.mkIf (cfg.environmentFile != null) [ cfg.environmentFile ]; + ExecStart = '' + ${lib.getExe cfg.package} server \ + --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ + --web.telemetry-path ${cfg.telemetryPath} \ + ${lib.concatStringsSep " \\\n " cfg.extraFlags} + ''; + }; + }; +} diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index 772067b520c8..23740dd98e3d 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -6,7 +6,7 @@ let inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest; inherit (pkgs.lib) concatStringsSep maintainers mapAttrs mkMerge - removeSuffix replaceStrings singleton splitString; + removeSuffix replaceStrings singleton splitString makeBinPath; /* * The attrset `exporterTests` contains one attribute @@ -914,6 +914,47 @@ let ''; }; + php-fpm = { + nodeName = "php_fpm"; + exporterConfig = { + enable = true; + environmentFile = pkgs.writeTextFile { + name = "/tmp/prometheus-php-fpm-exporter.env"; + text = '' + PHP_FPM_SCRAPE_URI="tcp://127.0.0.1:9000/status" + ''; + }; + }; + metricProvider = { + users.users."php-fpm-exporter" = { + isSystemUser = true; + group = "php-fpm-exporter"; + }; + users.groups."php-fpm-exporter" = {}; + services.phpfpm.pools."php-fpm-exporter" = { + user = "php-fpm-exporter"; + group = "php-fpm-exporter"; + settings = { + "pm" = "dynamic"; + "pm.max_children" = 32; + "pm.max_requests" = 500; + "pm.start_servers" = 2; + "pm.min_spare_servers" = 2; + "pm.max_spare_servers" = 5; + "pm.status_path" = "/status"; + "listen" = "127.0.0.1:9000"; + "listen.allowed_clients" = "127.0.0.1"; + }; + phpEnv."PATH" = makeBinPath [ pkgs.php ]; + }; + }; + exporterTest = '' + wait_for_unit("phpfpm-php-fpm-exporter.service") + wait_for_unit("prometheus-php-fpm-exporter.service") + succeed("curl -sSf http://localhost:9253/metrics | grep 'phpfpm_up{.*} 1'") + ''; + }; + postfix = { exporterConfig = { enable = true; From cba0a200b0ab5901191aec4328662bce1d54c79c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Reyrol?= Date: Wed, 28 Jun 2023 21:02:19 +0200 Subject: [PATCH 58/85] nixos/doc: new prometheus.exporters addition --- nixos/doc/manual/release-notes/rl-2311.section.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index d86fffd03733..2ce3bca6d0a0 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -82,6 +82,8 @@ - The module `services.calibre-server` has new options to configure the `host`, `port`, `auth.enable`, `auth.mode` and `auth.userDb` path, see [#216497](https://github.com/NixOS/nixpkgs/pull/216497/) for more details. +- `services.prometheus.exporters` has a new [exporter](https://github.com/hipages/php-fpm_exporter) to monitor PHP-FPM processes, see [#240394](https://github.com/NixOS/nixpkgs/pull/240394) for more details. + ## Nixpkgs internals {#sec-release-23.11-nixpkgs-internals} - The `qemu-vm.nix` module by default now identifies block devices via From 6cb0b6a4d63bab23bb5cd460561bf60b701db48b Mon Sep 17 00:00:00 2001 From: Kevin Cox Date: Wed, 28 Jun 2023 17:19:13 -0400 Subject: [PATCH 59/85] nixos.minetest-server: Add option for generating config file and ability to add extra command line flags This adds two main features: 1. `services.minetest-server.config` is an options object that is automatically serialized into a minetest config file. 2. `services.minetest-server.extraArgs` provides an escape hatch to pass extra arguments. --- .../services/games/minetest-server.nix | 71 ++++++++++++++++--- 1 file changed, 63 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/games/minetest-server.nix b/nixos/modules/services/games/minetest-server.nix index 578364ec542b..8dc360153497 100644 --- a/nixos/modules/services/games/minetest-server.nix +++ b/nixos/modules/services/games/minetest-server.nix @@ -3,15 +3,52 @@ with lib; let + CONTAINS_NEWLINE_RE = ".*\n.*"; + # The following values are reserved as complete option values: + # { - start of a group. + # """ - start of a multi-line string. + RESERVED_VALUE_RE = "[[:space:]]*(\"\"\"|\\{)[[:space:]]*"; + NEEDS_MULTILINE_RE = "${CONTAINS_NEWLINE_RE}|${RESERVED_VALUE_RE}"; + + # There is no way to encode """ on its own line in a Minetest config. + UNESCAPABLE_RE = ".*\n\"\"\"\n.*"; + + toConfMultiline = name: value: + assert lib.assertMsg + ((builtins.match UNESCAPABLE_RE value) == null) + ''""" can't be on its own line in a minetest config.''; + "${name} = \"\"\"\n${value}\n\"\"\"\n"; + + toConf = values: + lib.concatStrings + (lib.mapAttrsToList + (name: value: { + bool = "${name} = ${toString value}\n"; + int = "${name} = ${toString value}\n"; + null = ""; + set = "${name} = {\n${toConf value}}\n"; + string = + if (builtins.match NEEDS_MULTILINE_RE value) != null + then toConfMultiline name value + else "${name} = ${value}\n"; + }.${builtins.typeOf value}) + values); + cfg = config.services.minetest-server; - flag = val: name: optionalString (val != null) "--${name} ${toString val} "; + flag = val: name: lib.optionals (val != null) ["--${name}" "${toString val}"]; + flags = [ - (flag cfg.gameId "gameid") - (flag cfg.world "world") - (flag cfg.configPath "config") - (flag cfg.logPath "logfile") - (flag cfg.port "port") - ]; + "--server" + ] + ++ ( + if cfg.configPath != null + then ["--config" cfg.configPath] + else ["--config" (builtins.toFile "minetest.conf" (toConf cfg.config))]) + ++ (flag cfg.gameId "gameid") + ++ (flag cfg.world "world") + ++ (flag cfg.logPath "logfile") + ++ (flag cfg.port "port") + ++ cfg.extraArgs; in { options = { @@ -55,6 +92,16 @@ in ''; }; + config = mkOption { + type = types.attrsOf types.anything; + default = {}; + description = lib.mdDoc '' + Settings to add to the minetest config file. + + This option is ignored if `configPath` is set. + ''; + }; + logPath = mkOption { type = types.nullOr types.path; default = null; @@ -75,6 +122,14 @@ in If set to null, the default 30000 will be used. ''; }; + + extraArgs = mkOption { + type = types.listOf types.str; + default = []; + description = lib.mdDoc '' + Additional command line flags to pass to the minetest executable. + ''; + }; }; }; @@ -100,7 +155,7 @@ in script = '' cd /var/lib/minetest - exec ${pkgs.minetest}/bin/minetest --server ${concatStrings flags} + exec ${pkgs.minetest}/bin/minetest ${lib.escapeShellArgs flags} ''; }; }; From 3393bb2340b7decb88f29c7d9669bd105a1a6164 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 28 Jun 2023 22:44:15 +0000 Subject: [PATCH 60/85] sqlite-utils: 3.32.1 -> 3.33 --- pkgs/development/python-modules/sqlite-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlite-utils/default.nix b/pkgs/development/python-modules/sqlite-utils/default.nix index db77142a848a..6fb27b156685 100644 --- a/pkgs/development/python-modules/sqlite-utils/default.nix +++ b/pkgs/development/python-modules/sqlite-utils/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "sqlite-utils"; - version = "3.32.1"; + version = "3.33"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-bCj+Mvzr1lihaR3t+k0RFJmtMCzAE5xaWJOlkNRhhIo="; + hash = "sha256-vneZNtrbnezvURpG8oC9lGg9OFYl9pplcw+24A5fJlY="; }; postPatch = '' From 06c31d6db93eb403a1407d716bcfe7ee7990a33b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 28 Jun 2023 23:25:41 +0000 Subject: [PATCH 61/85] bosh-cli: 7.2.3 -> 7.2.4 --- pkgs/applications/networking/cluster/bosh-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/bosh-cli/default.nix b/pkgs/applications/networking/cluster/bosh-cli/default.nix index 9a6898e01627..f618b2c70515 100644 --- a/pkgs/applications/networking/cluster/bosh-cli/default.nix +++ b/pkgs/applications/networking/cluster/bosh-cli/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "bosh-cli"; - version = "7.2.3"; + version = "7.2.4"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sN6+hPH+VziXs94RkPdPlg6TKo/as4xC8Gd8MxAKluk="; + sha256 = "sha256-LVDWgyIBVp7UVnEuQ42eVfxDZB3BZn5InnPX7WN6MrA="; }; vendorHash = null; From 58283cfca737a41e7f187933fc9796a2b071980d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 29 Jun 2023 00:59:56 +0000 Subject: [PATCH 62/85] snappymail: 2.28.2 -> 2.28.3 --- pkgs/servers/snappymail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/snappymail/default.nix b/pkgs/servers/snappymail/default.nix index 6dc05106588c..405800cfd144 100644 --- a/pkgs/servers/snappymail/default.nix +++ b/pkgs/servers/snappymail/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "snappymail"; - version = "2.28.2"; + version = "2.28.3"; src = fetchurl { url = "https://github.com/the-djmaze/snappymail/releases/download/v${version}/snappymail-${version}.tar.gz"; - sha256 = "sha256-GrF3WTe4Mr27FlvVQg0WrDu/k8AYJUWUDzbKmgqeQ6E="; + sha256 = "sha256-N7g0xP0ibJWuzp1zNALw/GdZseLwzQnX4H9W0UJsBaU="; }; sourceRoot = "snappymail"; From e3e39e4fa8ea43ac56190e2a5758a88ebac58329 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 28 Jun 2023 16:08:46 +0800 Subject: [PATCH 63/85] keycloak: 21.1.1 -> 21.1.2 Diff: https://github.com/keycloak/keycloak/compare/21.1.1...21.1.2 --- pkgs/servers/keycloak/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix index 714aa674cc9a..33271a80ee1f 100644 --- a/pkgs/servers/keycloak/default.nix +++ b/pkgs/servers/keycloak/default.nix @@ -3,7 +3,6 @@ , fetchzip , makeWrapper , jre -, writeText , nixosTests , callPackage @@ -13,11 +12,11 @@ stdenv.mkDerivation rec { pname = "keycloak"; - version = "21.1.1"; + version = "21.1.2"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip"; - hash = "sha256-ZX5UKjU9BEtO/uA25WhSUmeO6jQ1FpKF1irFx2fwPBU="; + hash = "sha256-yux9LyGkdwQekNWKAx3Oara0D5Qca8g7fgPGeTiF2n4="; }; nativeBuildInputs = [ makeWrapper jre ]; From 3e428f35e41e41ca3dc60ae7cc3cc1bed28d5c2e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 29 Jun 2023 02:19:35 +0000 Subject: [PATCH 64/85] media-downloader: 3.1.0 -> 3.2.0 --- pkgs/applications/video/media-downloader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/media-downloader/default.nix b/pkgs/applications/video/media-downloader/default.nix index 6eb8aad6d8ff..af3ea0319f92 100644 --- a/pkgs/applications/video/media-downloader/default.nix +++ b/pkgs/applications/video/media-downloader/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "media-downloader"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "mhogomchungu"; repo = pname; rev = "${version}"; - hash = "sha256-/oKvjmLFchR2B/mcLIUVIHBK78u2OQGf2aiwVR/ZoQc="; + hash = "sha256-B+KegiU3bXZXyXDQDBYipdd/+cXrPkFFH56DBojZQbg="; }; nativeBuildInputs = [ From 1a3ea97c1900e73ff239a00416228a50407ce327 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 29 Jun 2023 02:30:35 +0000 Subject: [PATCH 65/85] cocogitto: 5.3.1 -> 5.4.0 --- pkgs/development/tools/cocogitto/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/cocogitto/default.nix b/pkgs/development/tools/cocogitto/default.nix index 9c17736ae3dc..5bb00e378571 100644 --- a/pkgs/development/tools/cocogitto/default.nix +++ b/pkgs/development/tools/cocogitto/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cocogitto"; - version = "5.3.1"; + version = "5.4.0"; src = fetchFromGitHub { owner = "oknozor"; repo = pname; rev = version; - sha256 = "sha256-Z0snC5NomUWzxI2qcRMxdZbC1aOQ8P2Ll9EdVfhP7ZU="; + sha256 = "sha256-HlvFE7payno4cBOZEQS3stsVPBte+1EUcfca5lVlmVc="; }; - cargoHash = "sha256-P/xwE3oLVsIoxPmG+S0htSHhZxCj79z2ARGe2WzWCEo="; + cargoHash = "sha256-zKqWrwd5dv6Vja/BXPXLBRFzb0wwrfwFsHXau+UBPg4="; # Test depend on git configuration that would likely exist in a normal user environment # and might be failing to create the test repository it works in. From 5e1dbe8d3e415be64dc262bad9793febae59a56c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 29 Jun 2023 03:02:12 +0000 Subject: [PATCH 66/85] python310Packages.wsgi-intercept: 1.11.0 -> 1.12.0 --- pkgs/development/python-modules/wsgi-intercept/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wsgi-intercept/default.nix b/pkgs/development/python-modules/wsgi-intercept/default.nix index 2d6b5911d11f..0931b08d6094 100644 --- a/pkgs/development/python-modules/wsgi-intercept/default.nix +++ b/pkgs/development/python-modules/wsgi-intercept/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "wsgi-intercept"; - version = "1.11.0"; + version = "1.12.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "wsgi_intercept"; inherit version; - hash = "sha256-KvrZs+EgeK7Du7ni6icKHfcF0W0RDde0W6Aj/EPZ2Hw="; + hash = "sha256-9b8fvzBzBqCIQJEdNnaDnLIPaoctLxF1WvLTbZcoEhw="; }; propagatedBuildInputs = [ From 5369a8262c96680704dc7954f175e865a2eb5770 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 29 Jun 2023 03:46:44 +0000 Subject: [PATCH 67/85] blackfire: 2.16.1 -> 2.16.2 --- pkgs/development/tools/misc/blackfire/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/misc/blackfire/default.nix b/pkgs/development/tools/misc/blackfire/default.nix index 52f406c11e16..18acc15741a2 100644 --- a/pkgs/development/tools/misc/blackfire/default.nix +++ b/pkgs/development/tools/misc/blackfire/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "blackfire"; - version = "2.16.1"; + version = "2.16.2"; src = passthru.sources.${stdenv.hostPlatform.system} or (throw "Unsupported platform for blackfire: ${stdenv.hostPlatform.system}"); @@ -57,23 +57,23 @@ stdenv.mkDerivation rec { sources = { "x86_64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb"; - sha256 = "G+uiPCt7AJQsxkY2Snc2941nkyo9NY3wv3uNCAFfSmE="; + sha256 = "4VEZU1w0Y4Sk+XVItNo4SOutG1XhPnsRN3J5CNNsKK4="; }; "i686-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb"; - sha256 = "F2uRmxe8fAPAN/z7T7Kr0h4zcVS4I9mg6nqNXmcwxpE="; + sha256 = "Fb6k/dCZ5duWDiWgU1UGF/6+eXqlyarA6GLcMkHbmUk="; }; "aarch64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb"; - sha256 = "0MJDqRU+2phJ9P/c8GpB+btde0rSkR1gPx8Jbc4gIGo="; + sha256 = "vsebmAKb64Z0MvHGgctNAn7DJR5RBo/hHKd/4VZ2qY8="; }; "aarch64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz"; - sha256 = "j6EfHRIN81uyro0QlzAjRSl3BLzObqI1EVuT9WaACu0="; + sha256 = "a1HLdNHo+6YuS1dzPza3C1Rjpia82AXpQuPhJ913e6A="; }; "x86_64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz"; - sha256 = "n02ABC8HzmQXWpgmXgCNBNFl1xw/kW/ncTNIeoJCUB0="; + sha256 = "yXXFi/Xk4yOp6i08UpTJdKhlI056phQ/ZxAaY8LUvbA="; }; }; From fec6a7576428bdd9f53869db0ac2b116bcbe7a61 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 29 Jun 2023 04:33:42 +0000 Subject: [PATCH 68/85] tela-circle-icon-theme: 2023-04-16 -> 2023-06-25 --- pkgs/data/icons/tela-circle-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/tela-circle-icon-theme/default.nix b/pkgs/data/icons/tela-circle-icon-theme/default.nix index d5c29013c51a..6e32d09dac68 100644 --- a/pkgs/data/icons/tela-circle-icon-theme/default.nix +++ b/pkgs/data/icons/tela-circle-icon-theme/default.nix @@ -19,13 +19,13 @@ lib.checkListOfEnum "${pname}: color variants" [ "standard" "black" "blue" "brow stdenvNoCC.mkDerivation rec { inherit pname; - version = "2023-04-16"; + version = "2023-06-25"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "OHI/kT4HMlWUTxIeGXjtuIYBzQKM3XTGXuE9cviNDTM="; + sha256 = "nob0Isx785YRP4QIj2CK+v99CUiRwtkge1dNXCCwaDs="; }; nativeBuildInputs = [ From f3e8f45d15c7620f6e0276ee3e606c4e00cd608d Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 29 Jun 2023 12:39:13 +0800 Subject: [PATCH 69/85] yamlfix: 1.10.0 -> 1.11.0 Diff: https://github.com/lyz-code/yamlfix/compare/refs/tags/1.10.0...1.11.0 Changelog: https://github.com/lyz-code/yamlfix/blob/1.11.0/CHANGELOG.md --- pkgs/development/python-modules/yamlfix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yamlfix/default.nix b/pkgs/development/python-modules/yamlfix/default.nix index bf29fdb831c4..21d3d810f1e8 100644 --- a/pkgs/development/python-modules/yamlfix/default.nix +++ b/pkgs/development/python-modules/yamlfix/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "yamlfix"; - version = "1.10.0"; + version = "1.11.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "lyz-code"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-tRF2mi2xAjCKKbPVcJ7YEc4UVmSorgP9DFm8t1z0XoA="; + hash = "sha256-NWlZYpdiJ3SWY0L9IhGhCAUrurWe6mPt+AK64szCQco="; }; nativeBuildInputs = [ From 65f3a4aee50d034851fb8652e315ca654c31d923 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Wed, 28 Jun 2023 21:43:51 -0700 Subject: [PATCH 70/85] python310Packages.jsonschema_3: remove --- .../python-modules/jsonschema/3_x.nix | 39 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 41 deletions(-) delete mode 100644 pkgs/development/python-modules/jsonschema/3_x.nix diff --git a/pkgs/development/python-modules/jsonschema/3_x.nix b/pkgs/development/python-modules/jsonschema/3_x.nix deleted file mode 100644 index b86c5abda6be..000000000000 --- a/pkgs/development/python-modules/jsonschema/3_x.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 -, attrs -, functools32 -, importlib-metadata -, mock -, nose -, pyperf -, pyrsistent -, setuptools-scm -, twisted -, vcversioner -}: - -buildPythonPackage rec { - pname = "jsonschema"; - version = "3.2.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "c8a85b28d377cc7737e46e2d9f2b4f44ee3c0e1deac6bf46ddefc7187d30797a"; - }; - - nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ attrs importlib-metadata functools32 pyrsistent ]; - nativeCheckInputs = [ nose mock pyperf twisted vcversioner ]; - - # zope namespace collides on py27 - doCheck = !isPy27; - checkPhase = '' - nosetests - ''; - - meta = with lib; { - homepage = "https://github.com/Julian/jsonschema"; - description = "An implementation of JSON Schema validation for Python"; - license = licenses.mit; - maintainers = with maintainers; [ domenkozar ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index ff35c7f785a6..d5cedbe65e2f 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -156,6 +156,7 @@ mapAliases ({ JayDeBeApi = jaydebeapi; # added 2023-02-19 jinja2_time = jinja2-time; # added 2022-11-07 JPype1 = jpype1; # added 2023-02-19 + jsonschema_3 = throw "jsonschema 3 is neither the latest version nor needed inside nixpkgs anymore"; # added 2023-06-28 jupyter_client = jupyter-client; # added 2021-10-15 jupyter_core = jupyter-core; # added 2023-01-05 jupyter_server = jupyter-server; # added 2023-01-05 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 71b66cd0b074..e2f09c08c259 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5319,8 +5319,6 @@ self: super: with self; { jsonschema = callPackage ../development/python-modules/jsonschema { }; - jsonschema_3 = callPackage ../development/python-modules/jsonschema/3_x.nix { }; - jsonschema-spec = callPackage ../development/python-modules/jsonschema-spec { }; jsonstreams = callPackage ../development/python-modules/jsonstreams { }; From 220417787f057a3f8daf7bb8530395a0b1079f32 Mon Sep 17 00:00:00 2001 From: Basil Keeler Date: Wed, 28 Jun 2023 23:45:57 -0500 Subject: [PATCH 71/85] nixos/base16-schemes: unstable-2022-12-16 -> unstable-2023-05-02 --- pkgs/data/themes/base16-schemes/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/themes/base16-schemes/default.nix b/pkgs/data/themes/base16-schemes/default.nix index b4e3b1c87d6f..674eeabc6256 100644 --- a/pkgs/data/themes/base16-schemes/default.nix +++ b/pkgs/data/themes/base16-schemes/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "base16-schemes"; - version = "unstable-2022-12-16"; + version = "unstable-2023-05-02"; src = fetchFromGitHub { owner = "tinted-theming"; repo = "base16-schemes"; - rev = "cf6bc892a24af19e11383adedc6ce7901f133ea7"; - sha256 = "sha256-U9pfie3qABp5sTr3M9ga/jX8C807FeiXlmEZnC4ZM58="; + rev = "9a4002f78dd1094c123169da243680b2fda3fe69"; + sha256 = "sha256-AngNF++RZQB0l4M8pRgcv66pAcIPY+cCwmUOd+RBJKA="; }; installPhase = '' From 31b783812df152872d18fa99ba91e3fee346e32a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 29 Jun 2023 05:52:56 +0000 Subject: [PATCH 72/85] netbird-ui: 0.21.5 -> 0.21.7 --- pkgs/tools/networking/netbird/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index a20b69bb0547..1b370521eb7a 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -30,13 +30,13 @@ let in buildGoModule rec { pname = "netbird"; - version = "0.21.5"; + version = "0.21.7"; src = fetchFromGitHub { owner = "netbirdio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zsbxc6Arbqrx2LxmNJJXlsyQc7X6L84ej+2piy2Hy/k="; + sha256 = "sha256-y/1RWywWgDpklG6I58J//6IngdEgAQtsGEAS1z2X/M4="; }; vendorHash = "sha256-R5LhqW6uh7R8/vr60Sy0kVpAaTL3rwh5c4Ix08Rx6Zk="; From 6092b1b8b8a45f1c482a6c27b8da7754dcc4da48 Mon Sep 17 00:00:00 2001 From: Thane Gill Date: Wed, 28 Jun 2023 15:03:02 -0700 Subject: [PATCH 73/85] Fix typo in 23.05 release notes --- nixos/doc/manual/release-notes/rl-2305.section.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index 4d45463adea4..32a133b20e8c 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -192,7 +192,7 @@ In addition to numerous new and updated packages, this release has the following "hmac-sha2-512" "hmac-sha2-256" "umac-128@openssh.com" - }; + ]; ``` - `podman` now uses the `netavark` network stack. Users will need to delete all of their local containers, images, volumes, etc, by running `podman system reset --force` once before upgrading their systems. From 245dc64f221dea9bef357a9d37bf7203c5d9d069 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 29 Jun 2023 06:09:25 +0000 Subject: [PATCH 74/85] clickhouse-backup: 2.2.7 -> 2.3.0 --- .../tools/database/clickhouse-backup/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/database/clickhouse-backup/default.nix b/pkgs/development/tools/database/clickhouse-backup/default.nix index 53b413c8c82a..e13874ced60c 100644 --- a/pkgs/development/tools/database/clickhouse-backup/default.nix +++ b/pkgs/development/tools/database/clickhouse-backup/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "clickhouse-backup"; - version = "2.2.7"; + version = "2.3.0"; src = fetchFromGitHub { owner = "AlexAkulov"; repo = pname; rev = "v${version}"; - sha256 = "sha256-r84mbjkS3qdTNeM4t1S4YRJdKa6qNUzZVI0NOBM2MPI="; + sha256 = "sha256-yhRBaxt+hMNgnZK3qHgBnkRK/bWXeDfWHkiWzMLJn/g="; }; - vendorHash = "sha256-UY/8fWPoO3d0g1/CN215Q4z744S2cCT7fB4ctpridAI="; + vendorHash = "sha256-YSr3fKqJJtNRbUW1TjwDM96cA6CoYz1LUit/pC8V3Fs="; ldflags = [ "-X main.version=${version}" From 14e917507da5a3685877e0854dba5977bd200360 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 29 Jun 2023 06:12:38 +0000 Subject: [PATCH 75/85] pachyderm: 2.6.3 -> 2.6.4 --- pkgs/applications/networking/cluster/pachyderm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/pachyderm/default.nix b/pkgs/applications/networking/cluster/pachyderm/default.nix index 9fd167f6ebe8..b48caf0253b9 100644 --- a/pkgs/applications/networking/cluster/pachyderm/default.nix +++ b/pkgs/applications/networking/cluster/pachyderm/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pachyderm"; - version = "2.6.3"; + version = "2.6.4"; src = fetchFromGitHub { owner = "pachyderm"; repo = "pachyderm"; rev = "v${version}"; - hash = "sha256-e/pdNS3GOTKknh4Qbfc9Uf5uK2Zjsev8RkSg4QIxM8Y="; + hash = "sha256-V8N7KaNlpDTOmUdfx3otC7ady57lkXHFcZ1LO8VMnFU="; }; vendorHash = "sha256-3EG9d4ERaWuHaKFt0KFCOKIgTdrL7HZTO+GSi2RROKY="; From 5c260c8034afe4725545b1055d3fa99deac74dfc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 29 Jun 2023 06:26:42 +0000 Subject: [PATCH 76/85] aliyun-cli: 3.0.165 -> 3.0.167 --- pkgs/tools/admin/aliyun-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/aliyun-cli/default.nix b/pkgs/tools/admin/aliyun-cli/default.nix index 342ad3c79529..dfbe5513c50a 100644 --- a/pkgs/tools/admin/aliyun-cli/default.nix +++ b/pkgs/tools/admin/aliyun-cli/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "aliyun-cli"; - version = "3.0.165"; + version = "3.0.167"; src = fetchFromGitHub { rev = "v${version}"; owner = "aliyun"; repo = pname; fetchSubmodules = true; - sha256 = "sha256-WTdUlPtMK4Qssb3E8IBcencI+2gIP6d611tRLkFSV+A="; + sha256 = "sha256-53diBESwUa85+yHHvcBlAaCyvqu99Exudp/4+JOJQZw="; }; vendorHash = "sha256-wrFRGzVRN9kJC7uXwh07e1FSv2LBo38AtSjcDOtewks="; From 19b5b830a6f6a298e7cff8a3b5841e15c25906bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Thu, 29 Jun 2023 16:47:21 +1000 Subject: [PATCH 77/85] cf-vault: 0.0.13 -> 0.0.15 --- pkgs/tools/admin/cf-vault/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/cf-vault/default.nix b/pkgs/tools/admin/cf-vault/default.nix index b74d6685d96b..045a861198f5 100644 --- a/pkgs/tools/admin/cf-vault/default.nix +++ b/pkgs/tools/admin/cf-vault/default.nix @@ -1,16 +1,16 @@ {buildGoModule, fetchFromGitHub, lib}: buildGoModule rec { pname = "cf-vault"; - version = "0.0.13"; + version = "0.0.15"; src = fetchFromGitHub { owner = "jacobbednarz"; repo = pname; rev = version; - sha256 = "sha256-wW/CSF+DexrdmOvp3BpyBmltOyF4TBTW3OXwjdqfaR4="; + sha256 = "sha256-+6+I69LRCoU35lTrM8cZnzJsHB9SIr6OQKaiRFo7aW4="; }; - vendorSha256 = "sha256-H44YCoay/dVL22YhMy2AT/Jageu0pM9IS0SWPp9E4F8="; + vendorSha256 = "sha256-oNLGHV0NFYAU1pHQWeCmegonkEtMtGts0uWZWPnLVuY="; meta = with lib; { description = '' From 172f721a57b5235b828d1f4cfee546ce3ecc7627 Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 30 May 2023 22:27:40 +0900 Subject: [PATCH 78/85] python3Packages.scikit-optimize: mark broken This library has not been updated since Oct 12, 2021 and has not kept up with numpy updates. --- pkgs/development/python-modules/scikit-optimize/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/scikit-optimize/default.nix b/pkgs/development/python-modules/scikit-optimize/default.nix index 91eb003987f7..9288ea3f55d6 100644 --- a/pkgs/development/python-modules/scikit-optimize/default.nix +++ b/pkgs/development/python-modules/scikit-optimize/default.nix @@ -39,5 +39,6 @@ buildPythonPackage rec { homepage = "https://scikit-optimize.github.io/"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; + broken = true; # It will fix by https://github.com/scikit-optimize/scikit-optimize/pull/1123 }; } From dbb3d71c168bb6d7346279a0bc69c34423996adf Mon Sep 17 00:00:00 2001 From: eyJhb Date: Thu, 29 Jun 2023 09:20:58 +0200 Subject: [PATCH 79/85] displaylink: removed peterhoeg as maintainer --- pkgs/os-specific/linux/displaylink/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/displaylink/default.nix b/pkgs/os-specific/linux/displaylink/default.nix index cb62fbc7e5ae..528a528d522b 100644 --- a/pkgs/os-specific/linux/displaylink/default.nix +++ b/pkgs/os-specific/linux/displaylink/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { description = "DisplayLink DL-5xxx, DL-41xx and DL-3x00 Driver for Linux"; homepage = "https://www.displaylink.com/"; license = licenses.unfree; - maintainers = with maintainers; [ abbradar peterhoeg ]; + maintainers = with maintainers; [ abbradar ]; platforms = [ "x86_64-linux" "i686-linux" ]; hydraPlatforms = []; }; From ca6ef2e841d6c0c916f07f207e84d16ecdbb7e3f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 29 Jun 2023 07:11:54 +0000 Subject: [PATCH 80/85] python311Packages.weaviate-client: 3.19.2 -> 3.21.0 --- pkgs/development/python-modules/weaviate-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/weaviate-client/default.nix b/pkgs/development/python-modules/weaviate-client/default.nix index b671d262d49d..8fc5fe72aca7 100644 --- a/pkgs/development/python-modules/weaviate-client/default.nix +++ b/pkgs/development/python-modules/weaviate-client/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "weaviate-client"; - version = "3.19.2"; + version = "3.21.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ZiyypfbazCyc322y33Dpo6ydGLQE0ML/lx2cuF2E6+0="; + hash = "sha256-7JSsVUiDx2XpTaiylHxPD6SgN47Tu+nzZT3zpbF0Wm0="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 82a2c346a09b572cd85e6d9fe2fc9662b4f362b2 Mon Sep 17 00:00:00 2001 From: emilylange Date: Thu, 29 Jun 2023 12:21:56 +0200 Subject: [PATCH 81/85] grafana-agent: 0.34.2 -> 0.34.3 https://github.com/grafana/agent/blob/v0.34.3/CHANGELOG.md https://github.com/grafana/agent/releases/tag/v0.34.3 diff: https://github.com/grafana/agent/compare/v0.34.2...v0.34.3 --- pkgs/servers/monitoring/grafana-agent/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/grafana-agent/default.nix b/pkgs/servers/monitoring/grafana-agent/default.nix index 8a6434ac9a61..03758872ede1 100644 --- a/pkgs/servers/monitoring/grafana-agent/default.nix +++ b/pkgs/servers/monitoring/grafana-agent/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "grafana-agent"; - version = "0.34.2"; + version = "0.34.3"; src = fetchFromGitHub { - rev = "v${version}"; owner = "grafana"; repo = "agent"; - hash = "sha256-PGxqIeOqc2U4i6l3ENnpb1BAoWrEAh2p3X+azzbpl3k="; + rev = "v${version}"; + hash = "sha256-llHMTuNWGipL732L+uCupILvomhwZMFT8tJaFkBs+AQ="; }; vendorHash = "sha256-x9c6xRk1Ska+kqoFhAJ9ei35Lg8wsgDpZpfxJ3UExfg="; From 6599971bde4868cbcd0bb2624c35d8e61858f477 Mon Sep 17 00:00:00 2001 From: Yaya Date: Mon, 19 Jun 2023 10:06:21 +0000 Subject: [PATCH 82/85] gitlab-container-registry: 3.76.0 -> 3.77.0 https://gitlab.com/gitlab-org/container-registry/-/blob/v3.77.0-gitlab/CHANGELOG.md --- .../gitlab/gitlab-container-registry/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix b/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix index a863726c02ce..d2db2c820ea3 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "gitlab-container-registry"; - version = "3.76.0"; + version = "3.77.0"; rev = "v${version}-gitlab"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "container-registry"; inherit rev; - sha256 = "sha256-A9c7c/CXRs5mYSvDOdHkYOYkl+Qm6M330TBUeTnegBs="; + sha256 = "sha256-tHNxPwm1h1wyXuzUUadz5YcRkPdc0QeayMIRt292uf8="; }; - vendorHash = "sha256-9rO2GmoFZrNA3Udaktn8Ek9uM8EEoc0I3uv4UEq1c1k="; + vendorHash = "sha256-/ITZBh0vRYHb6fDUZQNRwW2pmQulJlDZ8EbObUBtsz4="; postPatch = '' substituteInPlace health/checks/checks_test.go \ From 7fd06ae3e93acaa8ba9eb5743af8bc405b409aea Mon Sep 17 00:00:00 2001 From: Yaya Date: Tue, 20 Jun 2023 09:49:47 +0000 Subject: [PATCH 83/85] gitlab-container-registry: Disable a flaky test --- ...Disable-inmemory-storage-driver-test.patch | 38 +++++++++++++++++++ .../gitlab-container-registry/default.nix | 4 ++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/applications/version-management/gitlab/gitlab-container-registry/Disable-inmemory-storage-driver-test.patch diff --git a/pkgs/applications/version-management/gitlab/gitlab-container-registry/Disable-inmemory-storage-driver-test.patch b/pkgs/applications/version-management/gitlab/gitlab-container-registry/Disable-inmemory-storage-driver-test.patch new file mode 100644 index 000000000000..16f47fb3ae18 --- /dev/null +++ b/pkgs/applications/version-management/gitlab/gitlab-container-registry/Disable-inmemory-storage-driver-test.patch @@ -0,0 +1,38 @@ +From bc359e8f51a17ba759121339e87e90eed16e98fe Mon Sep 17 00:00:00 2001 +From: Yaya +Date: Tue, 20 Jun 2023 10:01:23 +0000 +Subject: [PATCH] Disable inmemory storage driver test + +--- + .../storage/driver/inmemory/driver_test.go | 19 ------------------- + 1 file changed, 19 deletions(-) + delete mode 100644 registry/storage/driver/inmemory/driver_test.go + +diff --git a/registry/storage/driver/inmemory/driver_test.go b/registry/storage/driver/inmemory/driver_test.go +deleted file mode 100644 +index dbc1916f..00000000 +--- a/registry/storage/driver/inmemory/driver_test.go ++++ /dev/null +@@ -1,19 +0,0 @@ +-package inmemory +- +-import ( +- "testing" +- +- storagedriver "github.com/docker/distribution/registry/storage/driver" +- "github.com/docker/distribution/registry/storage/driver/testsuites" +- "gopkg.in/check.v1" +-) +- +-// Hook up gocheck into the "go test" runner. +-func Test(t *testing.T) { check.TestingT(t) } +- +-func init() { +- inmemoryDriverConstructor := func() (storagedriver.StorageDriver, error) { +- return New(), nil +- } +- testsuites.RegisterSuite(inmemoryDriverConstructor, testsuites.NeverSkip) +-} +-- +2.40.1 + diff --git a/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix b/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix index d2db2c820ea3..17a186ef25e4 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix @@ -14,6 +14,10 @@ buildGoModule rec { vendorHash = "sha256-/ITZBh0vRYHb6fDUZQNRwW2pmQulJlDZ8EbObUBtsz4="; + patches = [ + ./Disable-inmemory-storage-driver-test.patch + ]; + postPatch = '' substituteInPlace health/checks/checks_test.go \ --replace \ From 5619360467972b38b361a6d784a6c2025ca46ef3 Mon Sep 17 00:00:00 2001 From: Yaya Date: Thu, 29 Jun 2023 13:18:30 +0200 Subject: [PATCH 84/85] gitlab: 16.1.0 -> 16.1.1 (#240503) https://gitlab.com/gitlab-org/gitlab/-/blob/v16.1.1-ee/CHANGELOG.md --- .../applications/version-management/gitlab/data.json | 12 ++++++------ .../version-management/gitlab/gitaly/default.nix | 4 ++-- .../gitlab/gitlab-pages/default.nix | 4 ++-- .../gitlab/gitlab-workhorse/default.nix | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 488bf1218053..d4acae1c4622 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,14 +1,14 @@ { - "version": "16.1.0", - "repo_hash": "sha256-sRel6okv2NYV4As3+AudqVvJ1/eLQGJGFvs+BA14wis=", + "version": "16.1.1", + "repo_hash": "sha256-y0a2jEWFVLtekZvhBZFOSyeDj8DI2Jxf208r5rhRUm4=", "yarn_hash": "1cqyf06810ls94nkys0l4p86ni902q32aqjp66m7j1x6ldh248al", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v16.1.0-ee", + "rev": "v16.1.1-ee", "passthru": { - "GITALY_SERVER_VERSION": "16.1.0", - "GITLAB_PAGES_VERSION": "16.1.0", + "GITALY_SERVER_VERSION": "16.1.1", + "GITLAB_PAGES_VERSION": "16.1.1", "GITLAB_SHELL_VERSION": "14.23.0", - "GITLAB_WORKHORSE_VERSION": "16.1.0" + "GITLAB_WORKHORSE_VERSION": "16.1.1" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 38e8a72526f9..ed0385290610 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -13,7 +13,7 @@ }: let - version = "16.1.0"; + version = "16.1.1"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -24,7 +24,7 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-+Fnj9fgQQtyGMWOL5NkNON/N9p6POjAtpF2O06iKh90="; + sha256 = "sha256-bbAu9OIo1FT2KX186ajV5OUcvFpKUGaYPxY2S2RvXo8="; }; vendorSha256 = "sha256-6oOFQGPwiMRQrESXsQsGzvWz9bCb0VTYIyyG/C2b3nA="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix index 8d96d160f756..5c7c3af92d4f 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "16.1.0"; + version = "16.1.1"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - sha256 = "sha256-vAprB+pDwpr2Wq4aM0wnHlNzUvc1ajasdORwT0LDTTY="; + sha256 = "sha256-xXA1KIn0uEuW3r4KnZ1A5Ci/pCbuUdZTYraVzYfUdoA="; }; vendorHash = "sha256-SN4r9hcTTQUr3miv2Cm7iBryyh7yG1xx9lCvq3vQwc0="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 1f64e343056b..ce642b32e164 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "16.1.0"; + version = "16.1.1"; src = fetchFromGitLab { owner = data.owner; From b7edbb0915adbd1bc00099d0905425babf3301a8 Mon Sep 17 00:00:00 2001 From: Tim Kleinschmidt Date: Thu, 29 Jun 2023 13:52:10 +0200 Subject: [PATCH 85/85] gex: 0.3.3 -> 0.3.8 (#225549) --- .../version-management/gex/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/gex/default.nix b/pkgs/applications/version-management/gex/default.nix index dbcc63419b75..c8b2e5005bca 100644 --- a/pkgs/applications/version-management/gex/default.nix +++ b/pkgs/applications/version-management/gex/default.nix @@ -2,25 +2,32 @@ , stdenv , rustPlatform , fetchFromGitHub +, pkg-config +, openssl +# waiting on gex to update to libgit2-sys >= 0.15 +, libgit2_1_5 }: rustPlatform.buildRustPackage rec { pname = "gex"; - version = "0.3.3"; + version = "0.3.8"; src = fetchFromGitHub { owner = "Piturnah"; repo = pname; rev = "v${version}"; - hash = "sha256-oUcQKpZqqb8wZDpdFfpxLpwdfQlokJE5bsoPwxh+JMM="; + hash = "sha256-pjyS0H25wdcexpzZ2vVzGTwDPzyvA9PDgzz81yLGTOY="; }; - cargoHash = "sha256-ZFrIlNysjlXI8n78N2Hkff6gAplipxSQXUWG8HJq8fs="; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl libgit2_1_5 ]; + + cargoHash = "sha256-+FwXm3QN9bt//dWqzkBzsGigyl1SSY4/P29QtV75V6M="; meta = with lib; { description = "Git Explorer: cross-platform git workflow improvement tool inspired by Magit"; homepage = "https://github.com/Piturnah/gex"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ Br1ght0ne ]; + maintainers = with maintainers; [ azd325 Br1ght0ne ]; }; }