From 5da1db47bf1f4610e86bf744855fa40f937d5949 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Tue, 15 Nov 2022 14:37:01 +0100 Subject: [PATCH 001/116] gnomeExtensions.tophat: patch missing dependency --- .../gnome/extensions/extensionOverrides.nix | 10 ++++++++++ .../tophat_at_fflewddur.github.io.patch | 13 +++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/desktops/gnome/extensions/extensionOverridesPatches/tophat_at_fflewddur.github.io.patch diff --git a/pkgs/desktops/gnome/extensions/extensionOverrides.nix b/pkgs/desktops/gnome/extensions/extensionOverrides.nix index b1c762a018f4..7195c2590397 100644 --- a/pkgs/desktops/gnome/extensions/extensionOverrides.nix +++ b/pkgs/desktops/gnome/extensions/extensionOverrides.nix @@ -10,6 +10,7 @@ , nvme-cli , procps , pulseaudio +, libgtop , python3 , smartmontools , substituteAll @@ -101,6 +102,15 @@ super: lib.trivial.pipe super [ meta.maintainers = with lib.maintainers; [ rhoriguchi ]; })) + (patchExtension "tophat@fflewddur.github.io" (old: { + patches = [ + (substituteAll { + src = ./extensionOverridesPatches/tophat_at_fflewddur.github.io.patch; + gtop_path = "${libgtop}/lib/girepository-1.0"; + }) + ]; + })) + (patchExtension "unite@hardpixel.eu" (old: { buildInputs = [ xprop ]; diff --git a/pkgs/desktops/gnome/extensions/extensionOverridesPatches/tophat_at_fflewddur.github.io.patch b/pkgs/desktops/gnome/extensions/extensionOverridesPatches/tophat_at_fflewddur.github.io.patch new file mode 100644 index 000000000000..03b016cae249 --- /dev/null +++ b/pkgs/desktops/gnome/extensions/extensionOverridesPatches/tophat_at_fflewddur.github.io.patch @@ -0,0 +1,13 @@ +diff --git a/extension.js b/extension.js +index 60396f8..b044872 100644 +--- a/extension.js ++++ b/extension.js +@@ -20,6 +20,8 @@ + + /* exported init, enable, disable */ + ++imports.gi.GIRepository.Repository.prepend_search_path('@gtop_path@'); ++ + let depFailures = []; + let missingLibs = []; + From a2719e490d9dbdf922995da5f76e6f6a6c0e3d42 Mon Sep 17 00:00:00 2001 From: piegames Date: Sun, 4 Dec 2022 12:25:43 +0100 Subject: [PATCH 002/116] .github/ISSUE_TEMPLATE: Improvements --- .github/ISSUE_TEMPLATE/bug_report.md | 1 + .github/ISSUE_TEMPLATE/build_failure.md | 7 +++- .../ISSUE_TEMPLATE/missing_documentation.md | 10 ++--- .../out_of_date_package_report.md | 40 ++++++++----------- .github/ISSUE_TEMPLATE/packaging_request.md | 5 ++- 5 files changed, 32 insertions(+), 31 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index c197f0340239..258c85f9dde8 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -26,6 +26,7 @@ If applicable, add screenshots to help explain your problem. Add any other context about the problem here. ### Notify maintainers + ### Metadata + Please run `nix-shell -p nix-info --run "nix-info -m"` and paste the result. ```console diff --git a/.github/ISSUE_TEMPLATE/missing_documentation.md b/.github/ISSUE_TEMPLATE/missing_documentation.md index c00dc91bae8f..e543f74d58da 100644 --- a/.github/ISSUE_TEMPLATE/missing_documentation.md +++ b/.github/ISSUE_TEMPLATE/missing_documentation.md @@ -1,7 +1,7 @@ --- name: Missing or incorrect documentation about: Help us improve the Nixpkgs and NixOS reference manuals -title: '' +title: 'Documentation request: ' labels: '9.needs: documentation' assignees: '' @@ -11,6 +11,10 @@ assignees: '' +## Proposal + + + ## Checklist @@ -26,7 +30,3 @@ assignees: '' [open documentation issues]: https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+is%3Aopen+label%3A%229.needs%3A+documentation%22 [open documentation pull requests]: https://github.com/NixOS/nixpkgs/pulls?q=is%3Aopen+is%3Apr+label%3A%228.has%3A+documentation%22%2C%226.topic%3A+documentation%22 -## Proposal - - - diff --git a/.github/ISSUE_TEMPLATE/out_of_date_package_report.md b/.github/ISSUE_TEMPLATE/out_of_date_package_report.md index f1535526c2a7..22c81e2661c3 100644 --- a/.github/ISSUE_TEMPLATE/out_of_date_package_report.md +++ b/.github/ISSUE_TEMPLATE/out_of_date_package_report.md @@ -1,24 +1,29 @@ --- name: Out-of-date package reports about: For packages that are out-of-date -title: '' +title: 'Update request: PACKAGENAME OLDVERSION → NEWVERSION' labels: '9.needs: package (update)' assignees: '' --- +##### Package details + +- Package name: + +- Current version: +- Desired version: + + +- [ ] This is a backporting request. +- Current stable version: ###### Checklist - - - -- [ ] Checked the [nixpkgs master branch](https://github.com/NixOS/nixpkgs) - [ ] Checked the [nixpkgs pull requests](https://github.com/NixOS/nixpkgs/pulls) -###### Project name -`nix search` name: - -current version: -desired version: +##### Notify maintainers -###### Notify maintainers - + maintainers: diff --git a/.github/ISSUE_TEMPLATE/packaging_request.md b/.github/ISSUE_TEMPLATE/packaging_request.md index 1ddcd983f31b..a76741fa8e6a 100644 --- a/.github/ISSUE_TEMPLATE/packaging_request.md +++ b/.github/ISSUE_TEMPLATE/packaging_request.md @@ -1,14 +1,15 @@ --- name: Packaging requests about: For packages that are missing -title: '' +title: 'Package request: PACKAGENAME' labels: '0.kind: packaging request' assignees: '' --- **Project description** -_describe the project a little_ + + **Metadata** From 550700773091562a3e0db7e3599e8a6eed1eb105 Mon Sep 17 00:00:00 2001 From: piegames Date: Thu, 15 Dec 2022 23:27:58 +0100 Subject: [PATCH 003/116] Update .github/ISSUE_TEMPLATE/missing_documentation.md Co-authored-by: Valentin Gagarin --- .github/ISSUE_TEMPLATE/missing_documentation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/missing_documentation.md b/.github/ISSUE_TEMPLATE/missing_documentation.md index e543f74d58da..3018b6b99448 100644 --- a/.github/ISSUE_TEMPLATE/missing_documentation.md +++ b/.github/ISSUE_TEMPLATE/missing_documentation.md @@ -1,7 +1,7 @@ --- name: Missing or incorrect documentation about: Help us improve the Nixpkgs and NixOS reference manuals -title: 'Documentation request: ' +title: 'Documentation: ' labels: '9.needs: documentation' assignees: '' From 483c606a948ee5e6123a3f400e6140caf5006d06 Mon Sep 17 00:00:00 2001 From: piegames Date: Tue, 27 Dec 2022 13:12:12 +0100 Subject: [PATCH 004/116] fixup! .github/ISSUE_TEMPLATE: Improvements --- .../out_of_date_package_report.md | 30 +++++-------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/out_of_date_package_report.md b/.github/ISSUE_TEMPLATE/out_of_date_package_report.md index 22c81e2661c3..2735534b0bc9 100644 --- a/.github/ISSUE_TEMPLATE/out_of_date_package_report.md +++ b/.github/ISSUE_TEMPLATE/out_of_date_package_report.md @@ -7,23 +7,11 @@ assignees: '' --- -##### Package details - - Package name: - -- Current version: -- Desired version: - - -- [ ] This is a backporting request. -- Current stable version: - -###### Checklist - +- Latest released version: + +- Current version on the unstable channel: +- Current version on the stable/release channel: - [ ] Checked the [nixpkgs pull requests](https://github.com/NixOS/nixpkgs/pulls) -##### Notify maintainers +**Notify maintainers** - + -maintainers: +----- -###### Note for maintainers - -Please tag this issue in your PR. +Note for maintainers: Please tag this issue in your PR. From 5c4f6161981917504c50b84864dcfd2f67dc037d Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Wed, 18 Jan 2023 18:06:21 +0100 Subject: [PATCH 005/116] lib.path: Minor improvements - Use isValid when possible instead of subpathInvalidReason: https://github.com/NixOS/nixpkgs/pull/209099#discussion_r1068714681 - Add documentation to function arguments - Use newlines for error messages: https://github.com/NixOS/nixpkgs/pull/208887#discussion_r1069737602 - Add short comments for the unit test groups: https://github.com/NixOS/nixpkgs/pull/208887#discussion_r1072913051 - Slight formatting improvement for laws: https://github.com/NixOS/nixpkgs/pull/209099#discussion_r1068707955 --- lib/path/default.nix | 23 ++++++++++++++++------- lib/path/tests/unit.nix | 4 ++++ 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/lib/path/default.nix b/lib/path/default.nix index 96a9244407bf..6fa7c1dd6419 100644 --- a/lib/path/default.nix +++ b/lib/path/default.nix @@ -25,6 +25,10 @@ let assertMsg ; + inherit (lib.path.subpath) + isValid + ; + # Return the reason why a subpath is invalid, or `null` if it's valid subpathInvalidReason = value: if ! isString value then @@ -133,7 +137,9 @@ in /* No rec! Add dependencies on this file at the top. */ { subpath.isValid "./foo//bar/" => true */ - subpath.isValid = value: + subpath.isValid = + # The value to check + value: subpathInvalidReason value == null; @@ -150,11 +156,11 @@ in /* No rec! Add dependencies on this file at the top. */ { Laws: - - (Idempotency) Normalising multiple times gives the same result: + - Idempotency - normalising multiple times gives the same result: subpath.normalise (subpath.normalise p) == subpath.normalise p - - (Uniqueness) There's only a single normalisation for the paths that lead to the same file system node: + - Uniqueness - there's only a single normalisation for the paths that lead to the same file system node: subpath.normalise p != subpath.normalise q -> $(realpath ${p}) != $(realpath ${q}) @@ -210,9 +216,12 @@ in /* No rec! Add dependencies on this file at the top. */ { subpath.normalise "/foo" => */ - subpath.normalise = path: - assert assertMsg (subpathInvalidReason path == null) - "lib.path.subpath.normalise: Argument is not a valid subpath string: ${subpathInvalidReason path}"; - joinRelPath (splitRelPath path); + subpath.normalise = + # The subpath string to normalise + subpath: + assert assertMsg (isValid subpath) '' + lib.path.subpath.normalise: Argument is not a valid subpath string: + ${subpathInvalidReason subpath}''; + joinRelPath (splitRelPath subpath); } diff --git a/lib/path/tests/unit.nix b/lib/path/tests/unit.nix index eccf3b7b1c33..da2c950de914 100644 --- a/lib/path/tests/unit.nix +++ b/lib/path/tests/unit.nix @@ -6,6 +6,7 @@ let inherit (lib.path) subpath; cases = lib.runTests { + # Test examples from the lib.path.subpath.isValid documentation testSubpathIsValidExample1 = { expr = subpath.isValid null; expected = false; @@ -30,6 +31,7 @@ let expr = subpath.isValid "./foo//bar/"; expected = true; }; + # Some extra tests testSubpathIsValidTwoDotsEnd = { expr = subpath.isValid "foo/.."; expected = false; @@ -71,6 +73,7 @@ let expected = true; }; + # Test examples from the lib.path.subpath.normalise documentation testSubpathNormaliseExample1 = { expr = subpath.normalise "foo//bar"; expected = "./foo/bar"; @@ -107,6 +110,7 @@ let expr = (builtins.tryEval (subpath.normalise "/foo")).success; expected = false; }; + # Some extra tests testSubpathNormaliseIsValidDots = { expr = subpath.normalise "./foo/.bar/.../baz...qux"; expected = "./foo/.bar/.../baz...qux"; From eac2538707ee6edd475cb40bfa2ec3d2c05c3ac0 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Wed, 18 Jan 2023 18:09:44 +0100 Subject: [PATCH 006/116] lib.path.append: init This function can be used to append strings to Nix path values in a safe way. --- lib/path/default.nix | 47 +++++++++++++++++++++++++++++++++++++++++ lib/path/tests/unit.nix | 36 ++++++++++++++++++++++++++++++- 2 files changed, 82 insertions(+), 1 deletion(-) diff --git a/lib/path/default.nix b/lib/path/default.nix index 6fa7c1dd6419..075e2fc0d137 100644 --- a/lib/path/default.nix +++ b/lib/path/default.nix @@ -4,6 +4,7 @@ let inherit (builtins) isString + isPath split match ; @@ -98,6 +99,52 @@ let in /* No rec! Add dependencies on this file at the top. */ { + /* Append a subpath string to a path. + + Like `path + ("/" + string)` but safer, because it errors instead of returning potentially surprising results. + More specifically, it checks that the first argument is a [path value type](https://nixos.org/manual/nix/stable/language/values.html#type-path"), + and that the second argument is a valid subpath string (see `lib.path.subpath.isValid`). + + Type: + append :: Path -> String -> Path + + Example: + append /foo "bar/baz" + => /foo/bar/baz + + # subpaths don't need to be normalised + append /foo "./bar//baz/./" + => /foo/bar/baz + + # can append to root directory + append /. "foo/bar" + => /foo/bar + + # first argument needs to be a path value type + append "/foo" "bar" + => + + # second argument needs to be a valid subpath string + append /foo /bar + => + append /foo "" + => + append /foo "/bar" + => + append /foo "../bar" + => + */ + append = + # The absolute path to append to + path: + # The subpath string to append + subpath: + assert assertMsg (isPath path) '' + lib.path.append: The first argument is of type ${builtins.typeOf path}, but a path was expected''; + assert assertMsg (isValid subpath) '' + lib.path.append: Second argument is not a valid subpath string: + ${subpathInvalidReason subpath}''; + path + ("/" + subpath); /* Whether a value is a valid subpath string. diff --git a/lib/path/tests/unit.nix b/lib/path/tests/unit.nix index da2c950de914..a1a45173a909 100644 --- a/lib/path/tests/unit.nix +++ b/lib/path/tests/unit.nix @@ -3,9 +3,43 @@ { libpath }: let lib = import libpath; - inherit (lib.path) subpath; + inherit (lib.path) append subpath; cases = lib.runTests { + # Test examples from the lib.path.append documentation + testAppendExample1 = { + expr = append /foo "bar/baz"; + expected = /foo/bar/baz; + }; + testAppendExample2 = { + expr = append /foo "./bar//baz/./"; + expected = /foo/bar/baz; + }; + testAppendExample3 = { + expr = append /. "foo/bar"; + expected = /foo/bar; + }; + testAppendExample4 = { + expr = (builtins.tryEval (append "/foo" "bar")).success; + expected = false; + }; + testAppendExample5 = { + expr = (builtins.tryEval (append /foo /bar)).success; + expected = false; + }; + testAppendExample6 = { + expr = (builtins.tryEval (append /foo "")).success; + expected = false; + }; + testAppendExample7 = { + expr = (builtins.tryEval (append /foo "/bar")).success; + expected = false; + }; + testAppendExample8 = { + expr = (builtins.tryEval (append /foo "../bar")).success; + expected = false; + }; + # Test examples from the lib.path.subpath.isValid documentation testSubpathIsValidExample1 = { expr = subpath.isValid null; From 75617407d29877ce877595e77f89e4a7317e6060 Mon Sep 17 00:00:00 2001 From: Thibault Gagnaux Date: Fri, 27 Jan 2023 17:15:00 +0100 Subject: [PATCH 007/116] colima: use lima-bin on darwin for native macOS virtualization support --- pkgs/applications/virtualization/colima/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/colima/default.nix b/pkgs/applications/virtualization/colima/default.nix index d13cfbd7f177..0e0f97562a21 100644 --- a/pkgs/applications/virtualization/colima/default.nix +++ b/pkgs/applications/virtualization/colima/default.nix @@ -1,14 +1,18 @@ { lib +, stdenv , buildGoModule , fetchFromGitHub , installShellFiles , lima +, lima-bin , makeWrapper , qemu , testers , colima }: +let lima-drv = if stdenv.isDarwin then lima-bin else lima; +in buildGoModule rec { pname = "colima"; version = "0.5.2"; @@ -41,7 +45,7 @@ buildGoModule rec { postInstall = '' wrapProgram $out/bin/colima \ - --prefix PATH : ${lib.makeBinPath [ lima qemu ]} + --prefix PATH : ${lib.makeBinPath [ lima-drv qemu ]} installShellCompletion --cmd colima \ --bash <($out/bin/colima completion bash) \ From e75161f4ba591199af1a7bd8fac3d77115b267a1 Mon Sep 17 00:00:00 2001 From: Thibault Gagnaux Date: Sun, 29 Jan 2023 17:15:06 +0100 Subject: [PATCH 008/116] colima: add comment on why we use lima-bin on darwin --- pkgs/applications/virtualization/colima/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/virtualization/colima/default.nix b/pkgs/applications/virtualization/colima/default.nix index 0e0f97562a21..4654b4b56ab4 100644 --- a/pkgs/applications/virtualization/colima/default.nix +++ b/pkgs/applications/virtualization/colima/default.nix @@ -11,6 +11,8 @@ , colima }: +# use lima-bin on darwin to support native macOS virtualization +# https://github.com/NixOS/nixpkgs/pull/209171 let lima-drv = if stdenv.isDarwin then lima-bin else lima; in buildGoModule rec { From 98f36b2d744c02c844200cc0624ba5bc226660e5 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 1 Feb 2023 09:20:48 +0100 Subject: [PATCH 009/116] ocamlPackages.dune_3: enable for OCaml < 4.08 --- pkgs/development/ocaml-modules/chrome-trace/default.nix | 1 + pkgs/development/ocaml-modules/ordering/default.nix | 1 + pkgs/development/ocaml-modules/xdg/default.nix | 1 + pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix | 1 + pkgs/top-level/ocaml-packages.nix | 7 ++++++- 5 files changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/chrome-trace/default.nix b/pkgs/development/ocaml-modules/chrome-trace/default.nix index fb6c14b3362e..9c427d343758 100644 --- a/pkgs/development/ocaml-modules/chrome-trace/default.nix +++ b/pkgs/development/ocaml-modules/chrome-trace/default.nix @@ -4,6 +4,7 @@ buildDunePackage rec { pname = "chrome-trace"; inherit (dune_3) src version; + minimalOCamlVersion = "4.08"; duneVersion = "3"; dontAddPrefix = true; diff --git a/pkgs/development/ocaml-modules/ordering/default.nix b/pkgs/development/ocaml-modules/ordering/default.nix index c3bffc013f95..8613ccf9ae08 100644 --- a/pkgs/development/ocaml-modules/ordering/default.nix +++ b/pkgs/development/ocaml-modules/ordering/default.nix @@ -4,6 +4,7 @@ buildDunePackage { pname = "ordering"; inherit (dune_3) version src; duneVersion = "3"; + minimalOCamlVersion = "4.08"; dontAddPrefix = true; diff --git a/pkgs/development/ocaml-modules/xdg/default.nix b/pkgs/development/ocaml-modules/xdg/default.nix index 8d3810fa7e9e..52543175e07c 100644 --- a/pkgs/development/ocaml-modules/xdg/default.nix +++ b/pkgs/development/ocaml-modules/xdg/default.nix @@ -5,6 +5,7 @@ buildDunePackage rec { inherit (dune_3) src version; duneVersion = "3"; + minimalOCamlVersion = "4.08"; dontAddPrefix = true; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix index cec91a02f209..8533c1ac41cc 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix @@ -7,6 +7,7 @@ buildDunePackage rec { pname = "js_of_ocaml-compiler"; version = "4.1.0"; duneVersion = "3"; + minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/ocsigen/js_of_ocaml/releases/download/${version}/js_of_ocaml-${version}.tbz"; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 301495961e33..57759ae28eec 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -357,7 +357,12 @@ let then pkgs.dune_2 else throw "dune_2 is not available for OCaml ${ocaml.version}"; - dune_3 = callPackage ../development/tools/ocaml/dune/3.nix { }; + dune_3 = + if lib.versionAtLeast ocaml.version "4.08" + then callPackage ../development/tools/ocaml/dune/3.nix { } + else if lib.versionAtLeast ocaml.version "4.02" + then pkgs.dune_3 + else throw "dune_3 is not available for OCaml ${ocaml.version}"; dune-action-plugin = callPackage ../development/ocaml-modules/dune-action-plugin { }; From 62a2cfe3636c69ba81c1aea16a473abad15dab30 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 1 Feb 2023 09:20:52 +0100 Subject: [PATCH 010/116] ocamlPackages.checkseum: use Dune 3 --- pkgs/development/ocaml-modules/checkseum/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/checkseum/default.nix b/pkgs/development/ocaml-modules/checkseum/default.nix index faeb905e6a7f..5bda0954ec49 100644 --- a/pkgs/development/ocaml-modules/checkseum/default.nix +++ b/pkgs/development/ocaml-modules/checkseum/default.nix @@ -10,10 +10,11 @@ buildDunePackage rec { pname = "checkseum"; minimalOCamlVersion = "4.07"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/checkseum/releases/download/v${version}/checkseum-${version}.tbz"; - sha256 = "sha256-K6QPMts5+hxH2a+WQ1N0lwMBoshG2T0bSozNgzRvAlo="; + hash = "sha256-K6QPMts5+hxH2a+WQ1N0lwMBoshG2T0bSozNgzRvAlo="; }; buildInputs = [ dune-configurator ]; From a22898bc378b5594541d029c5d1de81196f70832 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 4 Feb 2023 21:07:27 +0000 Subject: [PATCH 011/116] icingaweb2: 2.11.3 -> 2.11.4 --- pkgs/servers/icingaweb2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/icingaweb2/default.nix b/pkgs/servers/icingaweb2/default.nix index 875744898f62..83d482e251a1 100644 --- a/pkgs/servers/icingaweb2/default.nix +++ b/pkgs/servers/icingaweb2/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "icingaweb2"; - version = "2.11.3"; + version = "2.11.4"; src = fetchFromGitHub { owner = "Icinga"; repo = "icingaweb2"; rev = "v${version}"; - hash = "sha256-DxAWSU6nleTRkgtU6cW5KEJ0aQuzom+kGwTOk1Kg8CI="; + hash = "sha256-UMC1puEM0PhIu+lJouOj81tI/E6fz1PzPN0FU7TNwTg="; }; nativeBuildInputs = [ makeWrapper ]; From 3b3b4874360314a5c353da8a5af73afe924e7b94 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 4 Feb 2023 21:27:08 +0100 Subject: [PATCH 012/116] ocamlPackages.rusage: init at 1.0.0 --- .../ocaml-modules/rusage/default.nix | 20 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/ocaml-modules/rusage/default.nix diff --git a/pkgs/development/ocaml-modules/rusage/default.nix b/pkgs/development/ocaml-modules/rusage/default.nix new file mode 100644 index 000000000000..891784ba6def --- /dev/null +++ b/pkgs/development/ocaml-modules/rusage/default.nix @@ -0,0 +1,20 @@ +{ lib, fetchurl, buildDunePackage }: + +buildDunePackage rec { + pname = "rusage"; + version = "1.0.0"; + + duneVersion = "3"; + + src = fetchurl { + url = "https://github.com/CraigFe/ocaml-rusage/releases/download/${version}/rusage-${version}.tbz"; + hash = "sha256-OgYA2Fe1goqoaOS45Z6FBJNNYN/uq+KQoUwG8KSo6Fk="; + }; + + meta = { + description = "Bindings to the GETRUSAGE(2) syscall"; + homepage = "https://github.com/CraigFe/ocaml-rusage"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 301495961e33..cc46a0235670 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1233,6 +1233,8 @@ let rock = callPackage ../development/ocaml-modules/rock { }; + rusage = callPackage ../development/ocaml-modules/rusage { }; + samplerate = callPackage ../development/ocaml-modules/samplerate { }; secp256k1 = callPackage ../development/ocaml-modules/secp256k1 { From b93d92a3d4cf79b37ff38bbdb244d3bb12a1dc00 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 4 Feb 2023 21:27:33 +0100 Subject: [PATCH 013/116] =?UTF-8?q?ocamlPackages.irmin:=203.4.1=20?= =?UTF-8?q?=E2=86=92=203.5.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/irmin/chunk.nix | 1 + pkgs/development/ocaml-modules/irmin/containers.nix | 1 + pkgs/development/ocaml-modules/irmin/default.nix | 3 ++- pkgs/development/ocaml-modules/irmin/fs.nix | 1 + pkgs/development/ocaml-modules/irmin/mirage.nix | 1 + pkgs/development/ocaml-modules/irmin/pack.nix | 7 ++++--- pkgs/development/ocaml-modules/irmin/ppx.nix | 5 +++-- pkgs/development/ocaml-modules/irmin/test.nix | 1 + pkgs/development/ocaml-modules/irmin/tezos.nix | 1 + 9 files changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/development/ocaml-modules/irmin/chunk.nix b/pkgs/development/ocaml-modules/irmin/chunk.nix index 59bd81544945..61a0d6021ab6 100644 --- a/pkgs/development/ocaml-modules/irmin/chunk.nix +++ b/pkgs/development/ocaml-modules/irmin/chunk.nix @@ -4,6 +4,7 @@ buildDunePackage rec { pname = "irmin-chunk"; inherit (irmin) version src strictDeps; + duneVersion = "3"; propagatedBuildInputs = [ irmin fmt logs lwt ]; diff --git a/pkgs/development/ocaml-modules/irmin/containers.nix b/pkgs/development/ocaml-modules/irmin/containers.nix index 73cd25f3170d..aa003f39b3f4 100644 --- a/pkgs/development/ocaml-modules/irmin/containers.nix +++ b/pkgs/development/ocaml-modules/irmin/containers.nix @@ -7,6 +7,7 @@ buildDunePackage { pname = "irmin-containers"; inherit (ppx_irmin) src version strictDeps; + duneVersion = "3"; nativeBuildInputs = [ ppx_irmin diff --git a/pkgs/development/ocaml-modules/irmin/default.nix b/pkgs/development/ocaml-modules/irmin/default.nix index 66b572f576d6..485547ddcad6 100644 --- a/pkgs/development/ocaml-modules/irmin/default.nix +++ b/pkgs/development/ocaml-modules/irmin/default.nix @@ -9,7 +9,8 @@ buildDunePackage { inherit (ppx_irmin) src version strictDeps; - minimalOCamlVersion = "4.08"; + minimalOCamlVersion = "4.10"; + duneVersion = "3"; propagatedBuildInputs = [ astring diff --git a/pkgs/development/ocaml-modules/irmin/fs.nix b/pkgs/development/ocaml-modules/irmin/fs.nix index 1788cf1eda23..4b8d7c4b97aa 100644 --- a/pkgs/development/ocaml-modules/irmin/fs.nix +++ b/pkgs/development/ocaml-modules/irmin/fs.nix @@ -7,6 +7,7 @@ buildDunePackage rec { pname = "irmin-fs"; inherit (irmin) version src strictDeps; + duneVersion = "3"; propagatedBuildInputs = [ irmin astring logs lwt ]; diff --git a/pkgs/development/ocaml-modules/irmin/mirage.nix b/pkgs/development/ocaml-modules/irmin/mirage.nix index 9e4bd9330799..2d7d0a891249 100644 --- a/pkgs/development/ocaml-modules/irmin/mirage.nix +++ b/pkgs/development/ocaml-modules/irmin/mirage.nix @@ -4,6 +4,7 @@ buildDunePackage { pname = "irmin-mirage"; inherit (irmin) version src strictDeps; + duneVersion = "3"; propagatedBuildInputs = [ irmin fmt ptime mirage-clock diff --git a/pkgs/development/ocaml-modules/irmin/pack.nix b/pkgs/development/ocaml-modules/irmin/pack.nix index a1a2974a4d74..8c0c7b2a3b00 100644 --- a/pkgs/development/ocaml-modules/irmin/pack.nix +++ b/pkgs/development/ocaml-modules/irmin/pack.nix @@ -1,10 +1,11 @@ { lib, buildDunePackage -, index, ppx_irmin, irmin, optint, fmt, logs, lwt, mtime, cmdliner +, index, ppx_irmin, irmin, optint, fmt, logs, lwt, mtime, cmdliner, checkseum, rusage , alcotest, alcotest-lwt, astring, irmin-test }: buildDunePackage rec { - minimalOCamlVersion = "4.08"; + minimalOCamlVersion = "4.10"; + duneVersion = "3"; pname = "irmin-pack"; @@ -12,7 +13,7 @@ buildDunePackage rec { nativeBuildInputs = [ ppx_irmin ]; - propagatedBuildInputs = [ index irmin optint fmt logs lwt mtime cmdliner ]; + propagatedBuildInputs = [ index irmin optint fmt logs lwt mtime cmdliner checkseum rusage ]; checkInputs = [ astring alcotest alcotest-lwt irmin-test ]; diff --git a/pkgs/development/ocaml-modules/irmin/ppx.nix b/pkgs/development/ocaml-modules/irmin/ppx.nix index 83cd5b1d7f5f..4ff7f4a8bdd8 100644 --- a/pkgs/development/ocaml-modules/irmin/ppx.nix +++ b/pkgs/development/ocaml-modules/irmin/ppx.nix @@ -2,14 +2,15 @@ buildDunePackage rec { pname = "ppx_irmin"; - version = "3.4.1"; + version = "3.5.1"; src = fetchurl { url = "https://github.com/mirage/irmin/releases/download/${version}/irmin-${version}.tbz"; - sha256 = "sha256-kig2EWww7GgGijhpSgm7pSHPR+3Q5K5E4Ha5tJY9oYA="; + hash = "sha256-zXiKjT9KPdGNwWChU9SuyR6vaw+0GtQUZNJsecMEqY4="; }; minimalOCamlVersion = "4.10"; + duneVersion = "3"; propagatedBuildInputs = [ ppx_repr diff --git a/pkgs/development/ocaml-modules/irmin/test.nix b/pkgs/development/ocaml-modules/irmin/test.nix index 942200bf429a..4e2ccce71663 100644 --- a/pkgs/development/ocaml-modules/irmin/test.nix +++ b/pkgs/development/ocaml-modules/irmin/test.nix @@ -8,6 +8,7 @@ buildDunePackage { pname = "irmin-test"; inherit (irmin) version src strictDeps; + duneVersion = "3"; nativeBuildInputs = [ ppx_irmin ]; diff --git a/pkgs/development/ocaml-modules/irmin/tezos.nix b/pkgs/development/ocaml-modules/irmin/tezos.nix index 82a89daec359..ddfc0d073205 100644 --- a/pkgs/development/ocaml-modules/irmin/tezos.nix +++ b/pkgs/development/ocaml-modules/irmin/tezos.nix @@ -7,6 +7,7 @@ buildDunePackage rec { pname = "irmin-tezos"; inherit (irmin) version src strictDeps; + duneVersion = "3"; propagatedBuildInputs = [ irmin From 06a3791603d04bd5ca76ff72b40a405e6db291e0 Mon Sep 17 00:00:00 2001 From: tricktron Date: Sun, 5 Feb 2023 13:56:26 +0100 Subject: [PATCH 014/116] colima: make lima derivation configurable Co-authored-by: Weijia Wang <9713184+wegank@users.noreply.github.com> --- pkgs/applications/virtualization/colima/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/virtualization/colima/default.nix b/pkgs/applications/virtualization/colima/default.nix index 4654b4b56ab4..e49c2a659121 100644 --- a/pkgs/applications/virtualization/colima/default.nix +++ b/pkgs/applications/virtualization/colima/default.nix @@ -9,12 +9,11 @@ , qemu , testers , colima + # use lima-bin on darwin to support native macOS virtualization + # https://github.com/NixOS/nixpkgs/pull/209171 +, lima-drv ? if stdenv.isDarwin then lima-bin else lima }: -# use lima-bin on darwin to support native macOS virtualization -# https://github.com/NixOS/nixpkgs/pull/209171 -let lima-drv = if stdenv.isDarwin then lima-bin else lima; -in buildGoModule rec { pname = "colima"; version = "0.5.2"; From 72bce6efa49d09988f61fa804cb2fc418e569b3f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 Feb 2023 19:05:36 +0000 Subject: [PATCH 015/116] rpcs3: 0.0.26-14637-c471120a8 -> 0.0.26-14684-8652b7d35 --- pkgs/applications/emulators/rpcs3/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/emulators/rpcs3/default.nix b/pkgs/applications/emulators/rpcs3/default.nix index a97114a07a57..d3d5f1e11f5f 100644 --- a/pkgs/applications/emulators/rpcs3/default.nix +++ b/pkgs/applications/emulators/rpcs3/default.nix @@ -9,10 +9,10 @@ let # Keep these separate so the update script can regex them - rpcs3GitVersion = "14637-c471120a8"; - rpcs3Version = "0.0.26-14637-c471120a8"; - rpcs3Revision = "c471120a80ec6f12cd4489e1a9be073d7d9c96f2"; - rpcs3Sha256 = "1fl7zarxbjaz6mi3lqv55kdwpvjfz8d02qfl0655zihwm6zzdny5"; + rpcs3GitVersion = "14684-8652b7d35"; + rpcs3Version = "0.0.26-14684-8652b7d35"; + rpcs3Revision = "8652b7d358fe975242dd2c51c91fd2968e6bcb82"; + rpcs3Sha256 = "08cd082cih9pcppipkhid1x1s7bq4grsz0zfa1rlxkzw3lajxnrf"; ittapi = fetchFromGitHub { owner = "intel"; From 04cc8760beb617588c9bc5bb68797f01c7715206 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 6 Feb 2023 10:14:02 +0800 Subject: [PATCH 016/116] freeswitch: unpin openssl_1_1 --- pkgs/top-level/all-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c7abb7840b4c..add8b32e1df5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24360,7 +24360,6 @@ with pkgs; freeswitch = callPackage ../servers/sip/freeswitch { inherit (darwin.apple_sdk.frameworks) SystemConfiguration; - openssl = openssl_1_1; }; fusionInventory = callPackage ../servers/monitoring/fusion-inventory { }; From a3c897fe344b2070d9b28e1bff68cdc179561f55 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Feb 2023 08:04:40 +0000 Subject: [PATCH 017/116] python310Packages.elementpath: 3.0.2 -> 4.0.1 --- pkgs/development/python-modules/elementpath/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/elementpath/default.nix b/pkgs/development/python-modules/elementpath/default.nix index 0aa5c6583784..14876fa30d39 100644 --- a/pkgs/development/python-modules/elementpath/default.nix +++ b/pkgs/development/python-modules/elementpath/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "elementpath"; - version = "3.0.2"; + version = "4.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "elementpath"; rev = "refs/tags/v${version}"; - hash = "sha256-b+Th28GI2UOmfO4jy4biohAJWPiYWkvFLqqs9lgR4Vc="; + hash = "sha256-BEnSPRuQUnKXtPAJfjxS+fwE0rpPj1U2yRK8eImKMYw="; }; # avoid circular dependency with xmlschema which directly depends on this From fd3dc830465c709929592e7e76c210de0a6ebc47 Mon Sep 17 00:00:00 2001 From: Andreas Wiese Date: Mon, 6 Feb 2023 15:50:42 +0100 Subject: [PATCH 018/116] ham: 2020-09-09 -> 2022-10-26 --- pkgs/development/perl-modules/ham/default.nix | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/pkgs/development/perl-modules/ham/default.nix b/pkgs/development/perl-modules/ham/default.nix index 2fc4b3c3b430..8005322cff73 100644 --- a/pkgs/development/perl-modules/ham/default.nix +++ b/pkgs/development/perl-modules/ham/default.nix @@ -1,14 +1,22 @@ -{ lib, buildPerlPackage, fetchFromGitHub, makeWrapper, openssh, GitRepository, URI, XMLMini }: +{ lib +, buildPerlPackage +, fetchFromGitHub +, makeWrapper +, openssh +, GitRepository +, URI +, XMLMini +}: buildPerlPackage { pname = "ham-unstable"; - version = "2020-09-09"; + version = "2022-10-26"; src = fetchFromGitHub { owner = "kernkonzept"; repo = "ham"; - rev = "ae2a326f2efcdae0fa7c5bf0ba205b580fc91ecc"; - sha256 = "0m65pav2830y0ivwsy60dc4w457qlc0nqg43lji1kj2g96hmy2bw"; + rev = "f2f10516177d00a79fe81701351632df2544ba4e"; + hash = "sha256-cxlZh1x8ycpZIwSeOwqB6BtwYaMoWtSPaeiyW41epdk="; }; outputs = [ "out" ]; @@ -32,12 +40,12 @@ buildPerlPackage { doCheck = false; - meta = { + meta = with lib; { description = "A tool to manage big projects consisting of multiple loosely-coupled git repositories"; homepage = "https://github.com/kernkonzept/ham"; - license = "unknown"; # should be gpl2, but not quite sure - maintainers = with lib.maintainers; [ aw ]; + license = licenses.bsd2; + maintainers = with maintainers; [ aw ]; mainProgram = "ham"; - platforms = lib.platforms.unix; + platforms = platforms.unix; }; } From 35840330133dd0746ab2f4c6abb97bceace30e83 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Feb 2023 16:32:08 +0000 Subject: [PATCH 019/116] pdns-recursor: 4.8.1 -> 4.8.2 --- pkgs/servers/dns/pdns-recursor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index a41581d934c6..a449b242daf6 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "pdns-recursor"; - version = "4.8.1"; + version = "4.8.2"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; - sha256 = "17A0RwCSV+US8B/MRsvbnIWbZyocmyP684LocHZbDw0="; + sha256 = "sha256-Q4LT6E8TQBaFdyd53+3my8gVfs9nY/p/2x3TPuP3msc="; }; nativeBuildInputs = [ pkg-config ]; From 610af7778b04ebfe3c8ed715cc2b77af30c17304 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Mon, 6 Feb 2023 17:40:45 +0100 Subject: [PATCH 020/116] bambootracker: 0.6.0 -> 0.6.1 --- .../audio/bambootracker/default.nix | 36 +++++++++++++------ pkgs/top-level/all-packages.nix | 7 +++- 2 files changed, 32 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/audio/bambootracker/default.nix b/pkgs/applications/audio/bambootracker/default.nix index 08e347911924..d636d03eb009 100644 --- a/pkgs/applications/audio/bambootracker/default.nix +++ b/pkgs/applications/audio/bambootracker/default.nix @@ -1,39 +1,55 @@ -{ mkDerivation -, stdenv +{ stdenv , lib , fetchFromGitHub -, qmake , pkg-config -, qttools +, qmake , qtbase +, qttools , rtaudio , rtmidi +, wrapQtAppsHook }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "bambootracker"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "BambooTracker"; repo = "BambooTracker"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-yubaKTc8NFLxMY0/5c2VubRHgAGOsRlitmXJ1UHzl60="; + hash = "sha256-Ymi1tjJCgStF0Rtseelq/YuTtBs2PrbF898TlbjyYUw="; }; - nativeBuildInputs = [ qmake qttools pkg-config ]; + nativeBuildInputs = [ + pkg-config + qmake + qttools + wrapQtAppsHook + ]; - buildInputs = [ qtbase rtaudio rtmidi ]; + buildInputs = [ + qtbase + rtaudio + rtmidi + ]; - qmakeFlags = [ "CONFIG+=system_rtaudio" "CONFIG+=system_rtmidi" ]; + qmakeFlags = [ + "CONFIG+=system_rtaudio" + "CONFIG+=system_rtmidi" + ]; postConfigure = "make qmake_all"; + # Wrapping the inside of the app bundles, avoiding double-wrapping + dontWrapQtApps = stdenv.hostPlatform.isDarwin; + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications mv $out/{bin,Applications}/BambooTracker.app ln -s $out/{Applications/BambooTracker.app/Contents/MacOS,bin}/BambooTracker + wrapQtApp $out/Applications/BambooTracker.app/Contents/MacOS/BambooTracker ''; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 29b02a714f17..9e46e1423044 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28232,7 +28232,12 @@ with pkgs; azpainter = callPackage ../applications/graphics/azpainter { }; - bambootracker = libsForQt5.callPackage ../applications/audio/bambootracker { }; + bambootracker = libsForQt5.callPackage ../applications/audio/bambootracker { + stdenv = if stdenv.hostPlatform.isDarwin then + darwin.apple_sdk_11_0.stdenv + else + stdenv; + }; blocky = callPackage ../applications/networking/blocky { }; From f1db792d8a5866a929329fb93cec66b82ff6d6fd Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Mon, 6 Feb 2023 17:48:17 +0100 Subject: [PATCH 021/116] bambootracker-qt6: init at 0.6.1 --- pkgs/applications/audio/bambootracker/default.nix | 12 ++++++++++++ pkgs/top-level/all-packages.nix | 6 ++++++ 2 files changed, 18 insertions(+) diff --git a/pkgs/applications/audio/bambootracker/default.nix b/pkgs/applications/audio/bambootracker/default.nix index d636d03eb009..0cb33062bd0e 100644 --- a/pkgs/applications/audio/bambootracker/default.nix +++ b/pkgs/applications/audio/bambootracker/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , pkg-config , qmake +, qt5compat ? null , qtbase , qttools , rtaudio @@ -10,6 +11,8 @@ , wrapQtAppsHook }: +assert lib.versionAtLeast qtbase.version "6.0" -> qt5compat != null; + stdenv.mkDerivation rec { pname = "bambootracker"; version = "0.6.1"; @@ -22,6 +25,13 @@ stdenv.mkDerivation rec { hash = "sha256-Ymi1tjJCgStF0Rtseelq/YuTtBs2PrbF898TlbjyYUw="; }; + postPatch = lib.optionalString (lib.versionAtLeast qtbase.version "6.0") '' + # Work around lrelease finding in qmake being broken by using pre-Qt5.12 code path + # https://github.com/NixOS/nixpkgs/issues/214765 + substituteInPlace BambooTracker/lang/lang.pri \ + --replace 'equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 12)' 'if(true)' + ''; + nativeBuildInputs = [ pkg-config qmake @@ -33,6 +43,8 @@ stdenv.mkDerivation rec { qtbase rtaudio rtmidi + ] ++ lib.optionals (lib.versionAtLeast qtbase.version "6.0") [ + qt5compat ]; qmakeFlags = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9e46e1423044..57134b1b8af1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28238,6 +28238,12 @@ with pkgs; else stdenv; }; + bambootracker-qt6 = qt6Packages.callPackage ../applications/audio/bambootracker { + stdenv = if stdenv.hostPlatform.isDarwin then + darwin.apple_sdk_11_0.stdenv + else + stdenv; + }; blocky = callPackage ../applications/networking/blocky { }; From 9d4fdb9685729c49a047535a8a2c8001a66d5a91 Mon Sep 17 00:00:00 2001 From: paumr Date: Mon, 6 Feb 2023 18:08:54 +0100 Subject: [PATCH 022/116] nixos/roundcube: fixed nginx configuration the changes are required for oauth setups, and are based on: https://github.com/roundcube/roundcubemail/issues/8191#issuecomment-919850328 --- nixos/modules/services/mail/roundcube.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/mail/roundcube.nix b/nixos/modules/services/mail/roundcube.nix index e05820fb87cf..95dc2f6aa2c9 100644 --- a/nixos/modules/services/mail/roundcube.nix +++ b/nixos/modules/services/mail/roundcube.nix @@ -150,9 +150,13 @@ in root = cfg.package; index = "index.php"; extraConfig = '' - location ~* \.php$ { + location ~* \.php(/|$) { fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_pass unix:${fpm.socket}; + + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + include ${config.services.nginx.package}/conf/fastcgi_params; include ${pkgs.nginx}/conf/fastcgi.conf; } From 4611ffe60faa985b90414be6b4e54d9084035f87 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 12 Jan 2023 22:22:11 +0100 Subject: [PATCH 023/116] proxysql: 2.4.5 -> 2.4.6 --- pkgs/servers/sql/proxysql/default.nix | 4 +-- pkgs/servers/sql/proxysql/makefiles.patch | 37 ++++++++++++----------- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/pkgs/servers/sql/proxysql/default.nix b/pkgs/servers/sql/proxysql/default.nix index a2d48d388c2e..571433f7d070 100644 --- a/pkgs/servers/sql/proxysql/default.nix +++ b/pkgs/servers/sql/proxysql/default.nix @@ -32,13 +32,13 @@ stdenv.mkDerivation rec { pname = "proxysql"; - version = "2.4.5"; + version = "2.4.6"; src = fetchFromGitHub { owner = "sysown"; repo = pname; rev = version; - hash = "sha256-JWrll6VF0Ss1DlPNrh+xd3sGMclMeb6dlVgHd/UaNs0="; + hash = "sha256-EquQCmXXspCpbyi1apoCcrICZAYq9BXlZsvy3KfHPJc="; }; patches = [ diff --git a/pkgs/servers/sql/proxysql/makefiles.patch b/pkgs/servers/sql/proxysql/makefiles.patch index a5c4d7f80cc2..b10984f40a79 100644 --- a/pkgs/servers/sql/proxysql/makefiles.patch +++ b/pkgs/servers/sql/proxysql/makefiles.patch @@ -1,5 +1,5 @@ diff --git a/Makefile b/Makefile -index fba4e6a1..ceff4f3d 100644 +index ecbe04a9..4b5031a3 100644 --- a/Makefile +++ b/Makefile @@ -57,11 +57,7 @@ endif @@ -15,7 +15,7 @@ index fba4e6a1..ceff4f3d 100644 USERCHECK := $(shell getent passwd proxysql) GROUPCHECK := $(shell getent group proxysql) -@@ -724,16 +720,10 @@ cleanbuild: +@@ -754,16 +750,10 @@ cleanbuild: .PHONY: install install: src/proxysql @@ -36,10 +36,10 @@ index fba4e6a1..ceff4f3d 100644 install -m 0755 etc/init.d/proxysql /etc/init.d ifeq ($(DISTRO),"CentOS Linux") diff --git a/deps/Makefile b/deps/Makefile -index 13eed9c5..9abb2262 100644 +index b25e31b7..7196e493 100644 --- a/deps/Makefile +++ b/deps/Makefile -@@ -65,18 +65,11 @@ endif +@@ -65,11 +65,6 @@ endif libinjection/libinjection/src/libinjection.a: @@ -48,8 +48,10 @@ index 13eed9c5..9abb2262 100644 -ifneq ($(CENTOSVER),6) - cd libinjection/libinjection && patch -p1 < ../update-build-py3.diff -endif - sed -i 's/CC=/CC?=/' libinjection/libinjection/src/Makefile - cd libinjection/libinjection && CC=${CC} CXX=${CXX} ${MAKE} + ifeq ($(UNAME_S),Darwin) + sed -i '' 's/CC=/CC?=/' libinjection/libinjection/src/Makefile + else +@@ -79,8 +74,6 @@ endif libinjection: libinjection/libinjection/src/libinjection.a libssl/openssl/libssl.a: @@ -58,7 +60,7 @@ index 13eed9c5..9abb2262 100644 cd libssl/openssl && patch crypto/ec/curve448/curve448.c < ../curve448.c-multiplication-overflow.patch cd libssl/openssl && patch crypto/asn1/a_time.c < ../a_time.c-multiplication-overflow.patch cd libssl/openssl && ./config no-ssl3 no-tests -@@ -93,8 +86,6 @@ ifeq ($(MIN_VERSION),$(lastword $(sort $(GCC_VERSION) $(MIN_VERSION)))) +@@ -97,8 +90,6 @@ ifeq ($(MIN_VERSION),$(lastword $(sort $(GCC_VERSION) $(MIN_VERSION)))) endif libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a: libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a re2/re2/obj/libre2.a @@ -67,7 +69,7 @@ index 13eed9c5..9abb2262 100644 ifeq ($(REQUIRE_PATCH), true) cd libhttpserver/libhttpserver && patch src/httpserver/basic_auth_fail_response.hpp < ../basic_auth_fail_response.hpp.patch cd libhttpserver/libhttpserver && patch src/httpserver/create_webserver.hpp < ../create_webserver.hpp.patch -@@ -117,34 +108,16 @@ endif +@@ -121,35 +112,17 @@ endif libhttpserver: libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a libev/libev/.libs/libev.a: @@ -82,6 +84,7 @@ index 13eed9c5..9abb2262 100644 - cd curl && rm -rf curl-*/ || true - cd curl && tar -zxf curl-*.tar.gz - #cd curl/curl && ./configure --disable-debug --disable-ftp --disable-ldap --disable-ldaps --disable-rtsp --disable-proxy --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smb --disable-smtp --disable-gopher --disable-manual --disable-ipv6 --disable-sspi --disable-crypto-auth --disable-ntlm-wb --disable-tls-srp --without-nghttp2 --without-libidn2 --without-libssh2 --without-brotli --with-ssl=$(shell pwd)/../../libssl/openssl/ && CC=${CC} CXX=${CXX} ${MAKE} + cd curl/curl && patch configure < ../configure.patch cd curl/curl && CFLAGS=-fPIC ./configure --disable-debug --disable-ftp --disable-ldap --disable-ldaps --disable-rtsp --disable-proxy --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smb --disable-smtp --disable-gopher --disable-manual --disable-ipv6 --disable-sspi --disable-ntlm-wb --disable-tls-srp --without-nghttp2 --without-libidn2 --without-libssh2 --without-brotli --without-librtmp --without-libpsl --without-zstd --with-ssl=$(shell pwd)/libssl/openssl/ --enable-shared=no && CC=${CC} CXX=${CXX} ${MAKE} curl: curl/curl/lib/.libs/libcurl.a @@ -96,13 +99,13 @@ index 13eed9c5..9abb2262 100644 - cd libmicrohttpd && tar -zxf libmicrohttpd-0.9.68.tar.gz - cd libmicrohttpd/libmicrohttpd && patch src/microhttpd/connection.c < ../connection.c-snprintf-overflow.patch -endif --ifeq ($(OS),Darwin) +-ifeq ($(UNAME_S),Darwin) - cd libmicrohttpd/libmicrohttpd && patch src/microhttpd/mhd_sockets.c < ../mhd_sockets.c-issue-5977.patch -endif cd libmicrohttpd/libmicrohttpd && ./configure --enable-https && CC=${CC} CXX=${CXX} ${MAKE} microhttpd: libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a -@@ -155,8 +128,6 @@ cityhash/cityhash/src/.libs/libcityhash.a: +@@ -160,8 +133,6 @@ cityhash/cityhash/src/.libs/libcityhash.a: cityhash: cityhash/cityhash/src/.libs/libcityhash.a lz4/lz4/liblz4.a: @@ -111,16 +114,16 @@ index 13eed9c5..9abb2262 100644 cd lz4/lz4 && CC=${CC} CXX=${CXX} ${MAKE} lz4: lz4/lz4/liblz4.a -@@ -181,8 +152,6 @@ clickhouse-cpp: clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib-s +@@ -186,8 +157,6 @@ clickhouse-cpp: clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib-s libdaemon/libdaemon/libdaemon/.libs/libdaemon.a: - cd libdaemon && rm -rf libdaemon-*/ || true - cd libdaemon && tar -zxf libdaemon-0.14.tar.gz - cd libdaemon/libdaemon && cp ../config.guess . && chmod +x config.guess && ./configure --disable-examples + cd libdaemon/libdaemon && cp ../config.guess . && chmod +x config.guess && cp ../config.sub . && chmod +x config.sub && ./configure --disable-examples cd libdaemon/libdaemon && CC=${CC} CXX=${CXX} ${MAKE} -@@ -253,17 +222,12 @@ sqlite3/sqlite3/sqlite3.o: +@@ -261,17 +230,12 @@ sqlite3/sqlite3/sqlite3.o: sqlite3: sqlite3/sqlite3/sqlite3.o libconfig/libconfig/lib/.libs/libconfig++.a: @@ -138,7 +141,7 @@ index 13eed9c5..9abb2262 100644 cd prometheus-cpp/prometheus-cpp && patch -p1 < ../serial_exposer.patch cd prometheus-cpp/prometheus-cpp && patch -p0 < ../registry_counters_reset.patch cd prometheus-cpp/prometheus-cpp && patch -p0 < ../include_limits.patch -@@ -273,10 +237,6 @@ prometheus-cpp/prometheus-cpp/lib/libprometheus-cpp-core.a: +@@ -281,10 +245,6 @@ prometheus-cpp/prometheus-cpp/lib/libprometheus-cpp-core.a: prometheus-cpp: prometheus-cpp/prometheus-cpp/lib/libprometheus-cpp-core.a re2/re2/obj/libre2.a: @@ -147,9 +150,9 @@ index 13eed9c5..9abb2262 100644 -# cd re2/re2 && sed -i -e 's/-O3 -g /-O3 -fPIC /' Makefile -# cd re2/re2 && patch util/mutex.h < ../mutex.h.patch cd re2/re2 && patch re2/onepass.cc < ../onepass.cc-multiplication-overflow.patch - cd re2/re2 && sed -i -e 's/-O3 /-O3 -fPIC -DMEMORY_SANITIZER -DRE2_ON_VALGRIND /' Makefile - cd re2/re2 && sed -i -e 's/RE2_CXXFLAGS?=-std=c++11 /RE2_CXXFLAGS?=-std=c++11 -fPIC /' Makefile -@@ -285,8 +245,6 @@ re2/re2/obj/libre2.a: + ifeq ($(UNAME_S),Darwin) + cd re2/re2 && sed -i '' -e 's/-O3 /-O3 -fPIC -DMEMORY_SANITIZER -DRE2_ON_VALGRIND /' Makefile +@@ -298,8 +258,6 @@ endif re2: re2/re2/obj/libre2.a pcre/pcre/.libs/libpcre.a: From f87cac221fc7bff1af0b563073ae59f7764215c8 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 10 Jan 2023 16:44:34 +0100 Subject: [PATCH 024/116] proxysql: fix build --- pkgs/servers/sql/proxysql/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/sql/proxysql/default.nix b/pkgs/servers/sql/proxysql/default.nix index 571433f7d070..b676d71c67c8 100644 --- a/pkgs/servers/sql/proxysql/default.nix +++ b/pkgs/servers/sql/proxysql/default.nix @@ -68,10 +68,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - # otherwise, it looks for …-1.15 - ACLOCAL = "aclocal"; - AUTOMAKE = "automake"; - GIT_VERSION = version; dontConfigure = true; @@ -140,6 +136,18 @@ stdenv.mkDerivation rec { sed -i s_/usr/bin/env_${coreutils}/bin/env_g libssl/openssl/config + pushd libmicrohttpd/libmicrohttpd + autoreconf + popd + + pushd libconfig/libconfig + autoreconf + popd + + pushd libdaemon/libdaemon + autoreconf + popd + popd patchShebangs . ''; From 2e6581f905562b4bd709703bbaed76aae7a045c0 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 6 Feb 2023 18:26:44 +0100 Subject: [PATCH 025/116] proxysql: 2.4.6 -> 2.5.0 --- pkgs/servers/sql/proxysql/default.nix | 4 +-- pkgs/servers/sql/proxysql/makefiles.patch | 42 ++++++++++++++--------- 2 files changed, 27 insertions(+), 19 deletions(-) diff --git a/pkgs/servers/sql/proxysql/default.nix b/pkgs/servers/sql/proxysql/default.nix index b676d71c67c8..3f995c0e62d2 100644 --- a/pkgs/servers/sql/proxysql/default.nix +++ b/pkgs/servers/sql/proxysql/default.nix @@ -32,13 +32,13 @@ stdenv.mkDerivation rec { pname = "proxysql"; - version = "2.4.6"; + version = "2.5.0"; src = fetchFromGitHub { owner = "sysown"; repo = pname; rev = version; - hash = "sha256-EquQCmXXspCpbyi1apoCcrICZAYq9BXlZsvy3KfHPJc="; + hash = "sha256-psQzKycavS9xr24wGiRkr255IXW79AoG9fUEBkvPMZk="; }; patches = [ diff --git a/pkgs/servers/sql/proxysql/makefiles.patch b/pkgs/servers/sql/proxysql/makefiles.patch index b10984f40a79..05f8834c9538 100644 --- a/pkgs/servers/sql/proxysql/makefiles.patch +++ b/pkgs/servers/sql/proxysql/makefiles.patch @@ -1,5 +1,5 @@ diff --git a/Makefile b/Makefile -index ecbe04a9..4b5031a3 100644 +index e7dae058..09c28859 100644 --- a/Makefile +++ b/Makefile @@ -57,11 +57,7 @@ endif @@ -15,7 +15,7 @@ index ecbe04a9..4b5031a3 100644 USERCHECK := $(shell getent passwd proxysql) GROUPCHECK := $(shell getent group proxysql) -@@ -754,16 +750,10 @@ cleanbuild: +@@ -784,16 +780,10 @@ cleanbuild: .PHONY: install install: src/proxysql @@ -36,22 +36,21 @@ index ecbe04a9..4b5031a3 100644 install -m 0755 etc/init.d/proxysql /etc/init.d ifeq ($(DISTRO),"CentOS Linux") diff --git a/deps/Makefile b/deps/Makefile -index b25e31b7..7196e493 100644 +index 23ef204c..3fbcc4a7 100644 --- a/deps/Makefile +++ b/deps/Makefile -@@ -65,11 +65,6 @@ endif +@@ -65,10 +65,7 @@ endif libinjection/libinjection/src/libinjection.a: - cd libinjection && rm -rf libinjection-*/ || true - cd libinjection && tar -zxf libinjection-3.10.0.tar.gz --ifneq ($(CENTOSVER),6) + ifneq ($(CENTOSVER),6) - cd libinjection/libinjection && patch -p1 < ../update-build-py3.diff --endif + cd libinjection/libinjection && patch -p1 < ../libinjection_sqli.c.patch + endif ifeq ($(UNAME_S),Darwin) - sed -i '' 's/CC=/CC?=/' libinjection/libinjection/src/Makefile - else -@@ -79,8 +74,6 @@ endif +@@ -80,8 +77,6 @@ endif libinjection: libinjection/libinjection/src/libinjection.a libssl/openssl/libssl.a: @@ -60,16 +59,25 @@ index b25e31b7..7196e493 100644 cd libssl/openssl && patch crypto/ec/curve448/curve448.c < ../curve448.c-multiplication-overflow.patch cd libssl/openssl && patch crypto/asn1/a_time.c < ../a_time.c-multiplication-overflow.patch cd libssl/openssl && ./config no-ssl3 no-tests -@@ -97,8 +90,6 @@ ifeq ($(MIN_VERSION),$(lastword $(sort $(GCC_VERSION) $(MIN_VERSION)))) +@@ -99,9 +94,6 @@ ifeq ($(MIN_VERSION),$(lastword $(SORTED_VERSIONS))) endif libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a: libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a re2/re2/obj/libre2.a - cd libhttpserver && rm -rf libhttpserver-*/ || true - cd libhttpserver && tar -zxf libhttpserver-0.18.1.tar.gz - ifeq ($(REQUIRE_PATCH), true) +-#ifeq ($(REQUIRE_PATCH), true) cd libhttpserver/libhttpserver && patch src/httpserver/basic_auth_fail_response.hpp < ../basic_auth_fail_response.hpp.patch cd libhttpserver/libhttpserver && patch src/httpserver/create_webserver.hpp < ../create_webserver.hpp.patch -@@ -121,35 +112,17 @@ endif + cd libhttpserver/libhttpserver && patch src/httpserver/deferred_response.hpp < ../deferred_response.hpp.patch +@@ -112,7 +104,6 @@ libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a: libmicrohttpd/libmi + cd libhttpserver/libhttpserver && patch src/httpserver/http_response.hpp < ../http_response.hpp.patch + cd libhttpserver/libhttpserver && patch src/httpserver/string_response.hpp < ../string_response.hpp.patch + cd libhttpserver/libhttpserver && patch -p0 < ../re2_regex.patch +-#endif + cd libhttpserver/libhttpserver && patch -p0 < ../final_val_post_process.patch + cd libhttpserver/libhttpserver && patch -p0 < ../empty_uri_log_crash.patch + ifeq ($(UNAME_S),FreeBSD) +@@ -124,35 +115,17 @@ endif libhttpserver: libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a libev/libev/.libs/libev.a: @@ -105,7 +113,7 @@ index b25e31b7..7196e493 100644 cd libmicrohttpd/libmicrohttpd && ./configure --enable-https && CC=${CC} CXX=${CXX} ${MAKE} microhttpd: libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a -@@ -160,8 +133,6 @@ cityhash/cityhash/src/.libs/libcityhash.a: +@@ -163,8 +136,6 @@ cityhash/cityhash/src/.libs/libcityhash.a: cityhash: cityhash/cityhash/src/.libs/libcityhash.a lz4/lz4/liblz4.a: @@ -114,7 +122,7 @@ index b25e31b7..7196e493 100644 cd lz4/lz4 && CC=${CC} CXX=${CXX} ${MAKE} lz4: lz4/lz4/liblz4.a -@@ -186,8 +157,6 @@ clickhouse-cpp: clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib-s +@@ -189,8 +160,6 @@ clickhouse-cpp: clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib-s libdaemon/libdaemon/libdaemon/.libs/libdaemon.a: @@ -123,7 +131,7 @@ index b25e31b7..7196e493 100644 cd libdaemon/libdaemon && cp ../config.guess . && chmod +x config.guess && cp ../config.sub . && chmod +x config.sub && ./configure --disable-examples cd libdaemon/libdaemon && CC=${CC} CXX=${CXX} ${MAKE} -@@ -261,17 +230,12 @@ sqlite3/sqlite3/sqlite3.o: +@@ -264,17 +233,12 @@ sqlite3/sqlite3/sqlite3.o: sqlite3: sqlite3/sqlite3/sqlite3.o libconfig/libconfig/lib/.libs/libconfig++.a: @@ -141,7 +149,7 @@ index b25e31b7..7196e493 100644 cd prometheus-cpp/prometheus-cpp && patch -p1 < ../serial_exposer.patch cd prometheus-cpp/prometheus-cpp && patch -p0 < ../registry_counters_reset.patch cd prometheus-cpp/prometheus-cpp && patch -p0 < ../include_limits.patch -@@ -281,10 +245,6 @@ prometheus-cpp/prometheus-cpp/lib/libprometheus-cpp-core.a: +@@ -284,10 +248,6 @@ prometheus-cpp/prometheus-cpp/lib/libprometheus-cpp-core.a: prometheus-cpp: prometheus-cpp/prometheus-cpp/lib/libprometheus-cpp-core.a re2/re2/obj/libre2.a: @@ -152,7 +160,7 @@ index b25e31b7..7196e493 100644 cd re2/re2 && patch re2/onepass.cc < ../onepass.cc-multiplication-overflow.patch ifeq ($(UNAME_S),Darwin) cd re2/re2 && sed -i '' -e 's/-O3 /-O3 -fPIC -DMEMORY_SANITIZER -DRE2_ON_VALGRIND /' Makefile -@@ -298,8 +258,6 @@ endif +@@ -301,8 +261,6 @@ endif re2: re2/re2/obj/libre2.a pcre/pcre/.libs/libpcre.a: From 7ae6bfb6a12fce586392e85e7b6778e8b576a911 Mon Sep 17 00:00:00 2001 From: misuzu Date: Mon, 6 Feb 2023 21:30:30 +0200 Subject: [PATCH 026/116] python310Packages.pymemcache: disable broken test on 32-bit platforms --- pkgs/development/python-modules/pymemcache/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pymemcache/default.nix b/pkgs/development/python-modules/pymemcache/default.nix index cf69c2b0fa33..68925fe7f4a9 100644 --- a/pkgs/development/python-modules/pymemcache/default.nix +++ b/pkgs/development/python-modules/pymemcache/default.nix @@ -42,6 +42,11 @@ buildPythonPackage rec { disabledTests = [ # python-memcached is not available (last release in 2017) "TestClientSocketConnect" + ] ++ lib.optionals stdenv.is32bit [ + # test_compressed_complex is broken on 32-bit platforms + # this can be removed on the next version bump + # see also https://github.com/pinterest/pymemcache/pull/480 + "test_compressed_complex" ]; pythonImportsCheck = [ @@ -53,6 +58,5 @@ buildPythonPackage rec { homepage = "https://pymemcache.readthedocs.io/"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; - broken = stdenv.is32bit; }; } From fd6c52733b95ee8aff5cc6f18e1c8df17a5ea809 Mon Sep 17 00:00:00 2001 From: Jeremy Fleischman Date: Mon, 6 Feb 2023 09:44:18 -0800 Subject: [PATCH 027/116] mycli: skip broken test While I was in here, I ported this code to use `pytestCheckHook`. This fixes https://github.com/NixOS/nixpkgs/issues/211415 (maybe this is more of a workaround?). This build was failing due to a broken test upstream. I've instructed nix to skip that test for now. I also changed the `py.test` to plain `pytest`. I'm not familiar with the difference, but according to [this SO answer](https://stackoverflow.com/a/41893170/1739415), it sounds like `pytest` is the new hotness and should be used wherever possible. --- pkgs/tools/admin/mycli/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/admin/mycli/default.nix b/pkgs/tools/admin/mycli/default.nix index bf1ad3cfe47b..c1753fe1a563 100644 --- a/pkgs/tools/admin/mycli/default.nix +++ b/pkgs/tools/admin/mycli/default.nix @@ -30,16 +30,24 @@ buildPythonApplication rec { sqlparse ]; - nativeCheckInputs = [ pytest glibcLocales ]; + nativeCheckInputs = [ pytestCheckHook glibcLocales ]; - checkPhase = '' + preCheck = '' export HOME=. export LC_ALL="en_US.UTF-8" - - py.test \ - --ignore=mycli/packages/paramiko_stub/__init__.py ''; + disabledTestPaths = [ + "mycli/packages/paramiko_stub/__init__.py" + ]; + + disabledTests = [ + # Note: test_auto_escaped_col_names is currently failing due to a bug upstream. + # TODO: re-enable this test once there is a fix upstream. See + # https://github.com/dbcli/mycli/issues/1103 for details. + "test_auto_escaped_col_names" + ]; + postPatch = '' substituteInPlace setup.py \ --replace "cryptography == 36.0.2" "cryptography" From 91c5117c1b5d220ca6e5cebb3ab513fe647f6b43 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Mon, 6 Feb 2023 22:49:32 +0100 Subject: [PATCH 028/116] prowlarr: 1.1.2.2453 -> 1.1.3.2521 --- pkgs/servers/prowlarr/default.nix | 10 +++++----- pkgs/servers/prowlarr/update.sh | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/prowlarr/default.nix b/pkgs/servers/prowlarr/default.nix index 6dde194f92ea..31b342d833bc 100644 --- a/pkgs/servers/prowlarr/default.nix +++ b/pkgs/servers/prowlarr/default.nix @@ -16,17 +16,17 @@ let }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-0JeZaHaAJ0Z+wcEPGA8yidiKsU/lxEgC6BGpFEzjO0A="; - arm64-linux_hash = "sha256-/N8SY0JS3yX2MARb7MN68CWEZQ8mIXM5zmg96r8hVsw="; - x64-osx_hash = "sha256-kcD6ATOGYJULk6g+v4uISDtnzr0c1y2BntIt3MWUR0Q="; + x64-linux_hash = "sha256-hKvme3saa3/GT0l6OlFjYI0RPClo5rWtVYFN/YuJSaw="; + arm64-linux_hash = "sha256-f7YIJRk1AhlfepmsQqlDFMA97QnbAAzrUtPFfbuV+QY="; + x64-osx_hash = "sha256-7nU12Y7f+fwjziUm6O+xO78IZf8EOfgmz+JibAP/xk8="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "prowlarr"; - version = "1.1.2.2453"; + version = "1.1.3.2521"; src = fetchurl { - url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.develop.${version}.${os}-core-${arch}.tar.gz"; + url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.master.${version}.${os}-core-${arch}.tar.gz"; sha256 = hash; }; diff --git a/pkgs/servers/prowlarr/update.sh b/pkgs/servers/prowlarr/update.sh index d61edda5a0a3..2d21f724408d 100755 --- a/pkgs/servers/prowlarr/update.sh +++ b/pkgs/servers/prowlarr/update.sh @@ -13,7 +13,7 @@ updateHash() hashKey="${arch}-${os}_hash" - url="https://github.com/Prowlarr/Prowlarr/releases/download/v$version/Prowlarr.develop.$version.$os-core-$arch.tar.gz" + url="https://github.com/Prowlarr/Prowlarr/releases/download/v$version/Prowlarr.master.$version.$os-core-$arch.tar.gz" hash=$(nix-prefetch-url --type sha256 $url) sriHash="$(nix hash to-sri --type sha256 $hash)" From 2a7130d13a032093f5394ef0961842d1e1928789 Mon Sep 17 00:00:00 2001 From: Googlebot Date: Mon, 21 Mar 2022 19:48:32 -0400 Subject: [PATCH 029/116] nvidia: Reverse Prime Sync --- nixos/modules/hardware/video/nvidia.nix | 121 ++++++++++++++++++++---- 1 file changed, 100 insertions(+), 21 deletions(-) diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index cee230ac41cb..852675bbef3a 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -21,7 +21,8 @@ let pCfg = cfg.prime; syncCfg = pCfg.sync; offloadCfg = pCfg.offload; - primeEnabled = syncCfg.enable || offloadCfg.enable; + reverseSyncCfg = pCfg.reverseSync; + primeEnabled = syncCfg.enable || reverseSyncCfg.enable || offloadCfg.enable; nvidiaPersistencedEnabled = cfg.nvidiaPersistenced; nvidiaSettings = cfg.nvidiaSettings; busIDType = types.strMatching "([[:print:]]+[\:\@][0-9]{1,3}\:[0-9]{1,2}\:[0-9])?"; @@ -31,7 +32,8 @@ in imports = [ (mkRenamedOptionModule [ "hardware" "nvidia" "optimus_prime" "enable" ] [ "hardware" "nvidia" "prime" "sync" "enable" ]) - (mkRenamedOptionModule [ "hardware" "nvidia" "optimus_prime" "allowExternalGpu" ] [ "hardware" "nvidia" "prime" "sync" "allowExternalGpu" ]) + (mkRenamedOptionModule [ "hardware" "nvidia" "optimus_prime" "allowExternalGpu" ] [ "hardware" "nvidia" "prime" "allowExternalGpu" ]) + (mkRenamedOptionModule [ "hardware" "nvidia" "prime" "sync" "allowExternalGpu" ] [ "hardware" "nvidia" "prime" "allowExternalGpu" ]) (mkRenamedOptionModule [ "hardware" "nvidia" "optimus_prime" "nvidiaBusId" ] [ "hardware" "nvidia" "prime" "nvidiaBusId" ]) (mkRenamedOptionModule [ "hardware" "nvidia" "optimus_prime" "intelBusId" ] [ "hardware" "nvidia" "prime" "intelBusId" ]) ]; @@ -104,16 +106,17 @@ in description = lib.mdDoc '' Enable NVIDIA Optimus support using the NVIDIA proprietary driver via PRIME. If enabled, the NVIDIA GPU will be always on and used for all rendering, - while enabling output to displays attached only to the integrated Intel GPU - without a multiplexer. + while enabling output to displays attached only to the integrated Intel/AMD + GPU without a multiplexer. Note that this option only has any effect if the "nvidia" driver is specified in {option}`services.xserver.videoDrivers`, and it should preferably be the only driver there. - If this is enabled, then the bus IDs of the NVIDIA and Intel GPUs have to be - specified ({option}`hardware.nvidia.prime.nvidiaBusId` and - {option}`hardware.nvidia.prime.intelBusId`). + If this is enabled, then the bus IDs of the NVIDIA and Intel/AMD GPUs have to + be specified ({option}`hardware.nvidia.prime.nvidiaBusId` and + {option}`hardware.nvidia.prime.intelBusId` or + {option}`hardware.nvidia.prime.amdgpuBusId`). If you enable this, you may want to also enable kernel modesetting for the NVIDIA driver ({option}`hardware.nvidia.modesetting.enable`) in order @@ -125,11 +128,11 @@ in ''; }; - hardware.nvidia.prime.sync.allowExternalGpu = mkOption { + hardware.nvidia.prime.allowExternalGpu = mkOption { type = types.bool; default = false; description = lib.mdDoc '' - Configure X to allow external NVIDIA GPUs when using optimus. + Configure X to allow external NVIDIA GPUs when using Prime [Reverse] sync optimus. ''; }; @@ -139,9 +142,54 @@ in description = lib.mdDoc '' Enable render offload support using the NVIDIA proprietary driver via PRIME. - If this is enabled, then the bus IDs of the NVIDIA and Intel GPUs have to be - specified ({option}`hardware.nvidia.prime.nvidiaBusId` and - {option}`hardware.nvidia.prime.intelBusId`). + If this is enabled, then the bus IDs of the NVIDIA and Intel/AMD GPUs have to + be specified ({option}`hardware.nvidia.prime.nvidiaBusId` and + {option}`hardware.nvidia.prime.intelBusId` or + {option}`hardware.nvidia.prime.amdgpuBusId`). + ''; + }; + + hardware.nvidia.prime.offload.enableOffloadCmd = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Adds a `nvidia-offload` convenience script to {option}`environment.systemPackages` + for offloading programs to an nvidia device. To work, should have also enabled + {option}`hardware.nvidia.prime.offload.enable` or {option}`hardware.nvidia.prime.reverseSync.enable`. + + Example usage `nvidia-offload sauerbraten_client`. + ''; + }; + + hardware.nvidia.prime.reverseSync.enable = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Warning: This feature is relatively new, depending on your system this might + work poorly. AMD support, especially so. + See: https://forums.developer.nvidia.com/t/the-all-new-outputsink-feature-aka-reverse-prime/129828 + + Enable NVIDIA Optimus support using the NVIDIA proprietary driver via reverse + PRIME. If enabled, the Intel/AMD GPU will be used for all rendering, while + enabling output to displays attached only to the NVIDIA GPU without a + multiplexer. + + Note that this option only has any effect if the "nvidia" driver is specified + in {option}`services.xserver.videoDrivers`, and it should preferably + be the only driver there. + + If this is enabled, then the bus IDs of the NVIDIA and Intel/AMD GPUs have to + be specified ({option}`hardware.nvidia.prime.nvidiaBusId` and + {option}`hardware.nvidia.prime.intelBusId` or + {option}`hardware.nvidia.prime.amdgpuBusId`). + + If you enable this, you may want to also enable kernel modesetting for the + NVIDIA driver ({option}`hardware.nvidia.modesetting.enable`) in order + to prevent tearing. + + Note that this configuration will only be successful when a display manager + for which the {option}`services.xserver.displayManager.setupCommands` + option is supported is used. ''; }; @@ -205,6 +253,13 @@ in ''; } + { + assertion = offloadCfg.enableOffloadCmd -> offloadCfg.enable || reverseSyncCfg.enable; + message = '' + Offload command requires offloading or reverse prime sync to be enabled. + ''; + } + { assertion = primeEnabled -> pCfg.nvidiaBusId != "" && (pCfg.intelBusId != "" || pCfg.amdgpuBusId != ""); message = '' @@ -217,9 +272,19 @@ in message = "NVIDIA PRIME render offload is currently only supported on versions >= 435.21."; } + { + assertion = (reverseSyncCfg.enable && pCfg.amdgpuBusId != "") -> versionAtLeast nvidia_x11.version "470.0"; + message = "NVIDIA PRIME render offload for AMD APUs is currently only supported on versions >= 470 beta."; + } + { assertion = !(syncCfg.enable && offloadCfg.enable); - message = "Only one NVIDIA PRIME solution may be used at a time."; + message = "PRIME Sync and Offload cannot be both enabled"; + } + + { + assertion = !(syncCfg.enable && reverseSyncCfg.enable); + message = "PRIME Sync and PRIME Reverse Sync cannot be both enabled"; } { @@ -257,14 +322,16 @@ in # - Configure the display manager to run specific `xrandr` commands which will # configure/enable displays connected to the Intel iGPU / AMD APU. - services.xserver.drivers = let - in optional primeEnabled { + # reverse sync implies offloading + hardware.nvidia.prime.offload.enable = mkDefault reverseSyncCfg.enable; + + services.xserver.drivers = optional primeEnabled { name = igpuDriver; display = offloadCfg.enable; modules = optionals (igpuDriver == "amdgpu") [ pkgs.xorg.xf86videoamdgpu ]; deviceSection = '' BusID "${igpuBusId}" - ${optionalString (syncCfg.enable && igpuDriver != "amdgpu") ''Option "AccelMethod" "none"''} + ${optionalString (pCfg.enable && igpuDriver != "amdgpu") ''Option "AccelMethod" "none"''} ''; } ++ singleton { name = "nvidia"; @@ -273,7 +340,7 @@ in deviceSection = optionalString primeEnabled '' BusID "${pCfg.nvidiaBusId}" - ${optionalString syncCfg.allowExternalGpu "Option \"AllowExternalGpus\""} + ${optionalString pCfg.allowExternalGpu "Option \"AllowExternalGpus\""} ''; screenSection = '' @@ -290,19 +357,22 @@ in services.xserver.serverLayoutSection = optionalString syncCfg.enable '' Inactive "Device-${igpuDriver}[0]" + '' + optionalString reverseSyncCfg.enable '' + Inactive "Device-nvidia[0]" '' + optionalString offloadCfg.enable '' Option "AllowNVIDIAGPUScreens" ''; services.xserver.displayManager.setupCommands = let - sinkGpuProviderName = if igpuDriver == "amdgpu" then + gpuProviderName = if igpuDriver == "amdgpu" then # find the name of the provider if amdgpu "`${pkgs.xorg.xrandr}/bin/xrandr --listproviders | ${pkgs.gnugrep}/bin/grep -i AMD | ${pkgs.gnused}/bin/sed -n 's/^.*name://p'`" else igpuDriver; - in optionalString syncCfg.enable '' + providerCmdParams = if syncCfg.enable then "\"${gpuProviderName}\" NVIDIA-0" else "NVIDIA-G0 \"${gpuProviderName}\""; + in optionalString (syncCfg.enable || reverseSyncCfg.enable) '' # Added by nvidia configuration module for Optimus/PRIME. - ${pkgs.xorg.xrandr}/bin/xrandr --setprovideroutputsource "${sinkGpuProviderName}" NVIDIA-0 + ${pkgs.xorg.xrandr}/bin/xrandr --setprovideroutputsource ${providerCmdParams} ${pkgs.xorg.xrandr}/bin/xrandr --auto ''; @@ -325,7 +395,16 @@ in environment.systemPackages = [ nvidia_x11.bin ] ++ optionals cfg.nvidiaSettings [ nvidia_x11.settings ] - ++ optionals nvidiaPersistencedEnabled [ nvidia_x11.persistenced ]; + ++ optionals nvidiaPersistencedEnabled [ nvidia_x11.persistenced ] + ++ optionals offloadCfg.enableOffloadCmd [ + (pkgs.writeShellScriptBin "nvidia-offload" '' + export __NV_PRIME_RENDER_OFFLOAD=1 + export __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0 + export __GLX_VENDOR_LIBRARY_NAME=nvidia + export __VK_LAYER_NV_optimus=NVIDIA_only + exec "$@" + '') + ]; systemd.packages = optional cfg.powerManagement.enable nvidia_x11.out; From 8e47596d38462320f889007d158470070b263d52 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 6 Feb 2023 20:32:19 +0800 Subject: [PATCH 030/116] perlPackages.NetIPXS: init at 0.22 --- pkgs/top-level/perl-packages.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 96eca64590d2..1c4bf2821a13 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -17825,6 +17825,21 @@ let }; }; + NetIPXS = buildPerlPackage { + pname = "Net-IP-XS"; + version = "0.22"; + src = fetchurl { + url = "mirror://cpan/authors/id/T/TO/TOMHRR/Net-IP-XS-0.22.tar.gz"; + hash = "sha256-JZe0aDizgur3S6XJnD9gpqC1poHsNqFBchJL9E9LGSA="; + }; + propagatedBuildInputs = [ IOCapture TieSimple ]; + meta = { + homepage = "https://github.com/tomhrr/p5-Net-IP-XS"; + description = "IPv4/IPv6 address library"; + license = with lib.licenses; [ gpl2Plus ]; + }; + }; + NetLDAPServer = buildPerlPackage { pname = "Net-LDAP-Server"; version = "0.43"; From aba3b5d8cd1772b3eba9f664a9087339567128ef Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 6 Feb 2023 20:21:06 +0800 Subject: [PATCH 031/116] perlPackages.ZonemasterLDNS: 2.2.2 -> 3.1.0 --- pkgs/top-level/perl-packages.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1c4bf2821a13..3db482a2fc4f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -27854,18 +27854,18 @@ let ZonemasterLDNS = buildPerlPackage { pname = "Zonemaster-LDNS"; - version = "2.2.2"; + version = "3.1.0"; src = fetchurl { - url = "mirror://cpan/authors/id/Z/ZN/ZNMSTR/Zonemaster-LDNS-2.2.2.tar.gz"; - hash = "sha256-4KccPjWqdhkJvjI9QQGCPX/B8vRUGw91eUUgxhHk788="; + url = "mirror://cpan/authors/id/Z/ZN/ZNMSTR/Zonemaster-LDNS-3.1.0.tar.gz"; + hash = "sha256-Rr4uoQg5g9/ZLVnFQiLAz5MB+Uj39U24YWEa+o2+9HE="; }; - NIX_CFLAGS_COMPILE = "-I${pkgs.openssl_1_1.dev}/include -I${pkgs.libidn2}.dev}/include"; - NIX_CFLAGS_LINK = "-L${lib.getLib pkgs.openssl_1_1}/lib -L${lib.getLib pkgs.libidn2}/lib -lcrypto -lidn2"; + NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include -I${pkgs.libidn2}.dev}/include"; + NIX_CFLAGS_LINK = "-L${lib.getLib pkgs.openssl}/lib -L${lib.getLib pkgs.libidn2}/lib -lcrypto -lidn2"; - makeMakerFlags = [ "--prefix-openssl=${pkgs.openssl_1_1.dev}" ]; + makeMakerFlags = [ "--prefix-openssl=${pkgs.openssl.dev}" ]; nativeBuildInputs = [ pkgs.pkg-config ]; - buildInputs = [ DevelChecklib ModuleInstall ModuleInstallXSUtil TestFatal pkgs.ldns pkgs.libidn2 pkgs.openssl_1_1 ]; + buildInputs = [ DevelChecklib ModuleInstall ModuleInstallXSUtil TestFatal pkgs.ldns pkgs.libidn2 pkgs.openssl ]; meta = { description = "Perl wrapper for the ldns DNS library"; license = with lib.licenses; [ bsd3 ]; From c216e89616c9aac11f117004d26c390fa3ddbf86 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 6 Feb 2023 20:34:35 +0800 Subject: [PATCH 032/116] perlPackages.ZonemasterEngine: 4.5.1 -> 4.6.1 --- pkgs/top-level/perl-packages.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3db482a2fc4f..2b63caf4c9bc 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -27833,18 +27833,13 @@ let ZonemasterEngine = buildPerlPackage { pname = "Zonemaster-Engine"; - version = "4.5.1"; + version = "4.6.1"; src = fetchurl { - url = "mirror://cpan/authors/id/Z/ZN/ZNMSTR/Zonemaster-Engine-v4.5.1.tar.gz"; - hash = "sha256-RdIExtrXzZAXYIS/JCe6qM5QNoSlaZ6+sjbk0zvAuoY="; + url = "mirror://cpan/authors/id/Z/ZN/ZNMSTR/Zonemaster-Engine-v4.6.1.tar.gz"; + hash = "sha256-4AXo3bZTOLnnPjjX5KNb/2O7MRqcAtlqpz5sPwNN9b0="; }; buildInputs = [ PodCoverage TestDifferences TestException TestFatal TestNoWarnings TestPod ]; - propagatedBuildInputs = [ ClassAccessor Clone EmailValid FileShareDir FileSlurp IOSocketINET6 ListMoreUtils ModuleFind Moose MooseXSingleton NetIP Readonly TextCSV ZonemasterLDNS libintl-perl ]; - - preCheck = '' - # disable dnssec test as it fails - rm -f t/Test-dnssec.t t/manifest.t - ''; + propagatedBuildInputs = [ ClassAccessor Clone EmailValid FileShareDir FileSlurp IOSocketINET6 ListMoreUtils ModuleFind Moose MooseXSingleton NetIP NetIPXS Readonly TextCSV ZonemasterLDNS libintl-perl ]; meta = { description = "A tool to check the quality of a DNS zone"; From 00f5c6f33218f99a1fcc9bb4aab375253700d551 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 6 Feb 2023 20:40:27 +0800 Subject: [PATCH 033/116] perlPackages.ZonemasterCLI: 4.0.1 -> 5.0.1 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2b63caf4c9bc..8d58ea39aa17 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -27806,10 +27806,10 @@ let ZonemasterCLI = buildPerlPackage { pname = "Zonemaster-CLI"; - version = "4.0.1"; + version = "5.0.1"; src = fetchurl { - url = "mirror://cpan/authors/id/Z/ZN/ZNMSTR/Zonemaster-CLI-v4.0.1.tar.gz"; - hash = "sha256-7dNPe4E35JLmzoR0xFpVBXLcpQVqve/EXAdt+daWXKA="; + url = "mirror://cpan/authors/id/Z/ZN/ZNMSTR/Zonemaster-CLI-v5.0.1.tar.gz"; + hash = "sha256-a/PPgavkaw9gCW44rj7+6AjOOSHKglg4H3kr6jXuRE4="; }; propagatedBuildInputs = [ JSONXS From 063997be5064c5bca4994c9204c079ef0eae4ba5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 6 Feb 2023 16:01:32 -0800 Subject: [PATCH 034/116] imagemagick: 7.1.0-60 -> 7.1.0-61 Diff: https://github.com/ImageMagick/ImageMagick/compare/7.1.0-60...7.1.0-61 --- pkgs/applications/graphics/ImageMagick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 7b820c0e98a4..5adb53b401c6 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -47,13 +47,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "7.1.0-60"; + version = "7.1.0-61"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = version; - hash = "sha256-dQfmW9rt66eWOaKbZ9j8jc1k8v+F8B9TpTx12L+0VE4="; + hash = "sha256-g7WeqPpPd1gceU+s+vRDpb41IX1lzpiqh3cAYeFdUlg="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big From 91f3a79a017ef6eeeec72e7f1ed7cc7d54477379 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Feb 2023 01:44:23 +0000 Subject: [PATCH 035/116] aravis: 0.8.22 -> 0.8.24 --- pkgs/development/libraries/aravis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aravis/default.nix b/pkgs/development/libraries/aravis/default.nix index dd7691762567..7837fad283c0 100644 --- a/pkgs/development/libraries/aravis/default.nix +++ b/pkgs/development/libraries/aravis/default.nix @@ -29,13 +29,13 @@ assert enableViewer -> wrapGAppsHook != null; stdenv.mkDerivation rec { pname = "aravis"; - version = "0.8.22"; + version = "0.8.24"; src = fetchFromGitHub { owner = "AravisProject"; repo = pname; rev = version; - sha256 = "sha256-S9DmXjywxNr5Rpx605zip76vGKBSrUwyerqXlBm05VI="; + sha256 = "sha256-2d2CZzRfVr45gfgIg43Rr+1SoVIxzy8YjaQJhwi5owE="; }; outputs = [ "bin" "dev" "out" "lib" ]; From 01fecfaa9b190681c7a20e3a3e315669b6226b46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 6 Feb 2023 18:09:26 -0800 Subject: [PATCH 036/116] python310Packages.xmlschema: 2.1.1 -> 2.2.0 Diff: https://github.com/sissaschool/xmlschema/compare/refs/tags/v2.1.1...v2.2.0 Changelog: https://github.com/sissaschool/xmlschema/blob/refs/tags/v2.2.0/CHANGELOG.rst --- .../python-modules/xmlschema/default.nix | 20 +++++-------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/xmlschema/default.nix b/pkgs/development/python-modules/xmlschema/default.nix index cfec72b96835..00df9fc517c8 100644 --- a/pkgs/development/python-modules/xmlschema/default.nix +++ b/pkgs/development/python-modules/xmlschema/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , elementpath +, jinja2 , lxml , pytestCheckHook , pythonOlder @@ -9,7 +10,7 @@ buildPythonPackage rec { pname = "xmlschema"; - version = "2.1.1"; + version = "2.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +19,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "xmlschema"; rev = "refs/tags/v${version}"; - hash = "sha256-rt7QScg458ezDwktO1QRydmC3XqedX+kPpv6J+JvLzQ="; + hash = "sha256-KK1F8OVK+19ZWwu+2UtTMiVNyPPoPOv3V1qJFZAu2h4="; }; propagatedBuildInputs = [ @@ -26,28 +27,17 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + jinja2 lxml pytestCheckHook ]; - # Ignore broken fixtures, and tests for files which don't exist. - # For darwin, we need to explicity say we can't reach network - disabledTests = [ - "export_remote" - "element_tree_import_script" - ]; - - disabledTestPaths = [ - "tests/test_schemas.py" - "tests/test_memory.py" - "tests/test_validation.py" - ]; - pythonImportsCheck = [ "xmlschema" ]; meta = with lib; { + changelog = "https://github.com/sissaschool/xmlschema/blob/${src.rev}/CHANGELOG.rst"; description = "XML Schema validator and data conversion library for Python"; homepage = "https://github.com/sissaschool/xmlschema"; license = licenses.mit; From 0e48bebe62300c1ceea8d60cc6f494b9e0105033 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 7 Feb 2023 10:17:36 +0800 Subject: [PATCH 037/116] touchegg: 2.0.15 -> 2.0.16 https://github.com/JoseExposito/touchegg/compare/2.0.15...2.0.16 --- pkgs/tools/inputmethods/touchegg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/touchegg/default.nix b/pkgs/tools/inputmethods/touchegg/default.nix index 298de6a641ef..ff9786cfe3ba 100644 --- a/pkgs/tools/inputmethods/touchegg/default.nix +++ b/pkgs/tools/inputmethods/touchegg/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "touchegg"; - version = "2.0.15"; + version = "2.0.16"; src = fetchFromGitHub { owner = "JoseExposito"; repo = pname; rev = version; - sha256 = "sha256-oz3+hNNjQ/5vXWPMuhA2N2KK8W8S42WeSeDbhV4oJ9M="; + sha256 = "sha256-/0XeFW0cdS1/UaE/z2FROwk2dTyZMqXjiBzt62x8f8o="; }; patches = lib.optionals withPantheon [ From b8e06daabf43b13deecc257148b28dfa6dc6a7b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 6 Feb 2023 18:56:13 -0800 Subject: [PATCH 038/116] python310Packages.volvooncall: 0.10.1 -> 0.10.2 Diff: https://github.com/molobrakos/volvooncall/compare/refs/tags/v0.10.1...v0.10.2 --- pkgs/development/python-modules/volvooncall/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/volvooncall/default.nix b/pkgs/development/python-modules/volvooncall/default.nix index f3df712c3d51..133c9401a293 100644 --- a/pkgs/development/python-modules/volvooncall/default.nix +++ b/pkgs/development/python-modules/volvooncall/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "volvooncall"; - version = "0.10.1"; + version = "0.10.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "molobrakos"; repo = "volvooncall"; rev = "refs/tags/v${version}"; - hash = "sha256-udYvgKj7Rlc/hA86bbeBfnoVRjKkXT4TwpceWz226cU="; + hash = "sha256-/BMwDuo4xE/XOLM8qzJwt0A0h0+ihbCVCxT3BBToiVU="; }; patches = [ @@ -67,7 +67,6 @@ buildPythonPackage rec { meta = with lib; { description = "Retrieve information from the Volvo On Call web service"; homepage = "https://github.com/molobrakos/volvooncall"; - changelog = "https://github.com/molobrakos/volvooncall/releases/tag/v${version}"; license = licenses.unlicense; maintainers = with maintainers; [ dotlambda ]; }; From 3c3343ec9db334099e2c8dfaa4c9052cbea22957 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 7 Feb 2023 03:10:59 +0000 Subject: [PATCH 039/116] =?UTF-8?q?gnome-builder:=2043.5=20=E2=86=92=2043.?= =?UTF-8?q?6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-builder/-/compare/43.5...43.6 --- pkgs/applications/editors/gnome-builder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index 2518b6bd7d99..d04e2507c917 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -41,13 +41,13 @@ stdenv.mkDerivation rec { pname = "gnome-builder"; - version = "43.5"; + version = "43.6"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "Rav15H1s4jzjTXjFcOgeBrIntD6ZoRMlcy7GXhskU+o="; + sha256 = "m08hPdloyVL75CJoUPXJVk3f1XimoPiT06K2rhmjd6k="; }; patches = [ From 61eaaa6b556fa2f19333221b05e79156dfddf565 Mon Sep 17 00:00:00 2001 From: Hugh O'Brien Date: Mon, 6 Feb 2023 22:47:22 -0500 Subject: [PATCH 040/116] moolicute: 1.00.1 -> 1.01.0 --- pkgs/applications/misc/moolticute/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/moolticute/default.nix b/pkgs/applications/misc/moolticute/default.nix index 1525fb86f828..b692efc16390 100644 --- a/pkgs/applications/misc/moolticute/default.nix +++ b/pkgs/applications/misc/moolticute/default.nix @@ -9,13 +9,13 @@ mkDerivation rec { pname = "moolticute"; - version = "1.00.1"; + version = "1.01.0"; src = fetchFromGitHub { owner = "mooltipass"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oENMr3d2vFisEFl7gYBQQ0XRBeogAYOfBE5th463laI="; + sha256 = "sha256-6vqYyAJ9p0ey49kc2Tp/HZVv0mePARX2dcmcIG4bcNQ="; }; outputs = [ "out" "udev" ]; From b61b079b880a4bf4da6c4ef56f68cfb086c1e558 Mon Sep 17 00:00:00 2001 From: Hugh O'Brien Date: Mon, 6 Feb 2023 22:47:46 -0500 Subject: [PATCH 041/116] maintainers: add hughobrien --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a0f7a5c9b000..6431ef96fc59 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6071,6 +6071,12 @@ githubId = 1592375; name = "Walter Huf"; }; + hughobrien = { + email = "github@hughobrien.ie"; + github = "hughobrien"; + githubId = 3400690; + name = "Hugh O'Brien"; + }; hugolgst = { email = "hugo.lageneste@pm.me"; github = "hugolgst"; From 3ac97f85ff8b9a5351d67efbb80203b4e54a1276 Mon Sep 17 00:00:00 2001 From: Hugh O'Brien Date: Mon, 6 Feb 2023 22:48:13 -0500 Subject: [PATCH 042/116] moolticute: add hughobrien as maintainer --- pkgs/applications/misc/moolticute/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/moolticute/default.nix b/pkgs/applications/misc/moolticute/default.nix index b692efc16390..f51d9a329cd1 100644 --- a/pkgs/applications/misc/moolticute/default.nix +++ b/pkgs/applications/misc/moolticute/default.nix @@ -40,7 +40,7 @@ mkDerivation rec { ''; homepage = "https://github.com/mooltipass/moolticute"; license = licenses.gpl3Plus; - maintainers = [ maintainers.kirikaza ]; + maintainers = with maintainers; [ kirikaza hughobrien ]; platforms = platforms.linux; }; } From 527539fd2d6a9bef8922b35069912391fd84a103 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Feb 2023 03:56:32 +0000 Subject: [PATCH 043/116] python310Packages.desktop-notifier: 3.4.2 -> 3.4.3 --- pkgs/development/python-modules/desktop-notifier/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/desktop-notifier/default.nix b/pkgs/development/python-modules/desktop-notifier/default.nix index 840fbda9231b..29e5f915ccca 100644 --- a/pkgs/development/python-modules/desktop-notifier/default.nix +++ b/pkgs/development/python-modules/desktop-notifier/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "desktop-notifier"; - version = "3.4.2"; + version = "3.4.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "SamSchott"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-OujBpq3SBDKw9Jgb9MD200Rp0fD0OJRw90flxS22I2s="; + hash = "sha256-V5CggWp9G0/XoQhArrY3LCvfkF2SymORDWdJGjsr7yI="; }; nativeBuildInputs = [ From 2e82629b56a10d9c07ae765b1f3dd615af6f8a0a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Feb 2023 04:33:57 +0000 Subject: [PATCH 044/116] python310Packages.lupupy: 0.2.5 -> 0.2.7 --- pkgs/development/python-modules/lupupy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lupupy/default.nix b/pkgs/development/python-modules/lupupy/default.nix index 9f2e31fbc7df..cab862b20c3d 100644 --- a/pkgs/development/python-modules/lupupy/default.nix +++ b/pkgs/development/python-modules/lupupy/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "lupupy"; - version = "0.2.5"; + version = "0.2.7"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-SxhGUwcZjaRNCS5dB2hh5uctFGHWuKnM48CcIz6VMh8="; + hash = "sha256-nSa/qFJUnk1QTwUqq2il0RWCPdF4Jwby9NPIwAwcVds="; }; propagatedBuildInputs = [ From 1cedc22d83c26028f5983d3e97f8010b6d00f1ca Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Tue, 7 Feb 2023 13:14:31 +0800 Subject: [PATCH 045/116] shortwave: 3.1.0 -> 3.2.0 --- pkgs/applications/audio/shortwave/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/shortwave/default.nix b/pkgs/applications/audio/shortwave/default.nix index 9fce777906bb..807a27e67e1a 100644 --- a/pkgs/applications/audio/shortwave/default.nix +++ b/pkgs/applications/audio/shortwave/default.nix @@ -23,20 +23,20 @@ stdenv.mkDerivation rec { pname = "shortwave"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "Shortwave"; rev = version; - sha256 = "sha256-N0ftIq0+sxkpo56IGHZYAK6MgRNW7T6C2jWEiJsYy/Y="; + sha256 = "sha256-ESZ1yD1IuBar8bv83xMczZbtPtHbWRpe2yMVyr7K5gQ="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-90JBN3cJKqIJX6DRq5FtEpIr5Isxf+jb1SlxGMbBwMQ="; + hash = "sha256-8W46bGAitR2YbZbnsigAZMW5pSFTkDAe5JNaNOH5JfA="; }; nativeBuildInputs = [ From 70d75c24e41b82ee8ff9cd0d9e64115f67c7ff78 Mon Sep 17 00:00:00 2001 From: rewine Date: Thu, 12 Jan 2023 15:47:56 +0800 Subject: [PATCH 046/116] deepin-turbo: init at 0.0.6.3 --- pkgs/desktops/deepin/default.nix | 1 + .../deepin/misc/deepin-turbo/default.nix | 42 +++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 pkgs/desktops/deepin/misc/deepin-turbo/default.nix diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index b1cfa732d620..bb36b21b31c8 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -38,6 +38,7 @@ let #### MISC deepin-desktop-base = callPackage ./misc/deepin-desktop-base { }; + deepin-turbo = callPackage ./misc/deepin-turbo { }; }; in lib.makeScope libsForQt5.newScope packages diff --git a/pkgs/desktops/deepin/misc/deepin-turbo/default.nix b/pkgs/desktops/deepin/misc/deepin-turbo/default.nix new file mode 100644 index 000000000000..7eaca5768607 --- /dev/null +++ b/pkgs/desktops/deepin/misc/deepin-turbo/default.nix @@ -0,0 +1,42 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, pkg-config +, wrapQtAppsHook +, dtkwidget +}: + +stdenv.mkDerivation rec { + pname = "deepin-turbo"; + version = "0.0.6.3"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-t6/Ws/Q8DO0zBzrUr/liD61VkxbOv4W4x6VgMWr+Ozk="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ + dtkwidget + ]; + + postPatch = '' + substituteInPlace src/{booster-dtkwidget/CMakeLists.txt,booster-desktop/{CMakeLists.txt,desktop.conf},booster-generic/CMakeLists.txt} --replace "/usr" "$out" + ''; + + meta = with lib; { + description = "A daemon that helps to launch dtk applications faster"; + homepage = "https://github.com/linuxdeepin/deepin-turbo"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} From 7082124d63dd09b47a9623f9554d3c0e63900a54 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Feb 2023 05:42:29 +0000 Subject: [PATCH 047/116] setools: 4.4.0 -> 4.4.1 --- pkgs/os-specific/linux/setools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/setools/default.nix b/pkgs/os-specific/linux/setools/default.nix index 35a0355c0bc4..2e554a0241b2 100644 --- a/pkgs/os-specific/linux/setools/default.nix +++ b/pkgs/os-specific/linux/setools/default.nix @@ -8,13 +8,13 @@ with python3.pkgs; buildPythonApplication rec { pname = "setools"; - version = "4.4.0"; + version = "4.4.1"; src = fetchFromGitHub { owner = "SELinuxProject"; repo = pname; - rev = version; - sha256 = "1qvd5j6zwq4fmlahg45swjplhif2z89x7s6pnp07gvcp2fbqdsh5"; + rev = "refs/tags/${version}"; + sha256 = "sha256-4T5FIdnKi35JSm+IoYA2gIBBRV0nN0YLEw9xvDqNcgo="; }; nativeBuildInputs = [ cython ]; From 458c1628ee0a33af9439584f2cb4021366b63c33 Mon Sep 17 00:00:00 2001 From: Googlebot Date: Tue, 7 Feb 2023 00:51:39 -0500 Subject: [PATCH 048/116] fix logic --- nixos/modules/hardware/video/nvidia.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index 852675bbef3a..2eff322d9601 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -331,7 +331,7 @@ in modules = optionals (igpuDriver == "amdgpu") [ pkgs.xorg.xf86videoamdgpu ]; deviceSection = '' BusID "${igpuBusId}" - ${optionalString (pCfg.enable && igpuDriver != "amdgpu") ''Option "AccelMethod" "none"''} + ${optionalString (syncCfg.enable && igpuDriver != "amdgpu") ''Option "AccelMethod" "none"''} ''; } ++ singleton { name = "nvidia"; From 68081ec1711eb3aee80d0d515a24fabfacd7944a Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Mon, 6 Feb 2023 22:02:21 -0800 Subject: [PATCH 049/116] =?UTF-8?q?zulip:=205.9.4=20=E2=86=92=205.9.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Anders Kaseorg --- .../networking/instant-messengers/zulip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/zulip/default.nix b/pkgs/applications/networking/instant-messengers/zulip/default.nix index 241828fdfc3c..f46283583cd1 100644 --- a/pkgs/applications/networking/instant-messengers/zulip/default.nix +++ b/pkgs/applications/networking/instant-messengers/zulip/default.nix @@ -5,11 +5,11 @@ let pname = "zulip"; - version = "5.9.4"; + version = "5.9.5"; src = fetchurl { url = "https://github.com/zulip/zulip-desktop/releases/download/v${version}/Zulip-${version}-x86_64.AppImage"; - hash = "sha256-gbusyhMgoaQmeWm6dB6pc3kSykD4T97VQcJgcF5KbzM="; + hash = "sha256-w2thmF/UA42j3u3m4L+/onilQhwMOa7IJoOMZ/ERypw="; name="${pname}-${version}.AppImage"; }; From 5462eb42ac3163d574cf6f50b52f0728b6fbce4d Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Tue, 7 Feb 2023 14:15:08 +0800 Subject: [PATCH 050/116] python3Packages.soundfile: 0.10.3.post1 -> 0.11.0 --- .../python-modules/soundfile/default.nix | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/soundfile/default.nix b/pkgs/development/python-modules/soundfile/default.nix index 4bbf606ff523..5847dc2a63f9 100644 --- a/pkgs/development/python-modules/soundfile/default.nix +++ b/pkgs/development/python-modules/soundfile/default.nix @@ -12,24 +12,15 @@ buildPythonPackage rec { pname = "soundfile"; - version = "0.10.3.post1"; + version = "0.11.0"; # https://github.com/bastibe/python-soundfile/issues/157 disabled = isPyPy || stdenv.isi686; src = fetchPypi { - pname = "SoundFile"; - inherit version; - sha256 = "0yqhrfz7xkvqrwdxdx2ydy4h467sk7z3gf984y1x2cq7cm1gy329"; + inherit pname version; + sha256 = "sha256-kxc4ock+hoTC0+HVFKxjRAzoJ+x4PqCi0+RzDj3FjBg="; }; - patches = [ - # Fix build on macOS arm64, https://github.com/bastibe/python-soundfile/pull/332 - (fetchpatch { - url = "https://github.com/bastibe/python-soundfile/commit/e554e9ce8bed96207d587e6aa661e4b08f1c6a79.patch"; - sha256 = "sha256-vu/7s5q4I3yBnoNHmmFmcXvOLFcPwY9ri9ri6cKLDwU="; - }) - ]; - postPatch = '' substituteInPlace soundfile.py --replace "_find_library('sndfile')" "'${libsndfile.out}/lib/libsndfile${stdenv.hostPlatform.extensions.sharedLibrary}'" ''; @@ -38,10 +29,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy libsndfile cffi ]; propagatedNativeBuildInputs = [ cffi ]; - # Test fails on aarch64-darwin with `MemoryError`, 53 failed, 31 errors, see - # https://github.com/bastibe/python-soundfile/issues/331 - doCheck = stdenv.system != "aarch64-darwin"; - meta = { description = "An audio library based on libsndfile, CFFI and NumPy"; license = lib.licenses.bsd3; From a6c1d83fd463f5d798cab557f473e655fd4567fb Mon Sep 17 00:00:00 2001 From: Matt Carrier Date: Mon, 6 Feb 2023 22:16:45 -0800 Subject: [PATCH 051/116] lazygit: 0.36 -> 0.37.0 --- pkgs/development/tools/lazygit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/development/tools/lazygit/default.nix index 57c405a7f7b5..4e60fffbeb59 100644 --- a/pkgs/development/tools/lazygit/default.nix +++ b/pkgs/development/tools/lazygit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lazygit"; - version = "0.36.0"; + version = "0.37.0"; src = fetchFromGitHub { owner = "jesseduffield"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0emAo/K27lmQ+409maTR/hnonQVkbijF0RAwvIErBFo="; + sha256 = "sha256-A6aFHC4MNNFl7IieR/7aQ3cMzhBXfQwq6sPv+v5Gu4o="; }; vendorSha256 = null; From 8c60553edf36af246a57099bad4f4211a3550519 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 7 Feb 2023 07:17:08 +0100 Subject: [PATCH 052/116] ocamlPackages.sqlite3: disable for OCaml < 4.12 & use Dune 3 --- pkgs/development/ocaml-modules/caqti/driver-sqlite3.nix | 2 ++ pkgs/development/ocaml-modules/sqlite3/default.nix | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/caqti/driver-sqlite3.nix b/pkgs/development/ocaml-modules/caqti/driver-sqlite3.nix index 822c002a8de3..d6c230d9dbde 100644 --- a/pkgs/development/ocaml-modules/caqti/driver-sqlite3.nix +++ b/pkgs/development/ocaml-modules/caqti/driver-sqlite3.nix @@ -4,6 +4,8 @@ buildDunePackage { pname = "caqti-driver-sqlite3"; inherit (caqti) version src; + duneVersion = "3"; + propagatedBuildInputs = [ caqti ocaml_sqlite3 ]; meta = caqti.meta // { diff --git a/pkgs/development/ocaml-modules/sqlite3/default.nix b/pkgs/development/ocaml-modules/sqlite3/default.nix index f20a6cff0a89..cfd03493d3af 100644 --- a/pkgs/development/ocaml-modules/sqlite3/default.nix +++ b/pkgs/development/ocaml-modules/sqlite3/default.nix @@ -3,12 +3,12 @@ buildDunePackage rec { pname = "sqlite3"; version = "5.1.0"; - useDune2 = true; - minimumOCamlVersion = "4.05"; + duneVersion = "3"; + minimalOCamlVersion = "4.12"; src = fetchurl { url = "https://github.com/mmottl/sqlite3-ocaml/releases/download/${version}/sqlite3-${version}.tbz"; - sha256 = "sha256-uw23EWkajfok/insTstpEkRK2Q4PTER6+Jgx5tHf/qU="; + hash = "sha256-uw23EWkajfok/insTstpEkRK2Q4PTER6+Jgx5tHf/qU="; }; nativeBuildInputs = [ pkg-config ]; From f4ff5a5943f2178a868d9bcb7d661e9e194a92ef Mon Sep 17 00:00:00 2001 From: zendo Date: Tue, 7 Feb 2023 14:54:46 +0800 Subject: [PATCH 053/116] lollypop: 1.4.35 -> 1.4.37 --- pkgs/applications/audio/lollypop/default.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index 3ee546de223b..005bef77d456 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -1,5 +1,5 @@ { lib -, fetchgit +, fetchFromGitLab , nix-update-script , meson , ninja @@ -9,7 +9,7 @@ , gst_all_1 , libhandy , libsecret -, libsoup +, libsoup_3 , appstream-glib , desktop-file-utils , totem-pl-parser @@ -25,16 +25,17 @@ python3.pkgs.buildPythonApplication rec { pname = "lollypop"; - version = "1.4.35"; + version = "1.4.37"; format = "other"; - doCheck = false; - src = fetchgit { - url = "https://gitlab.gnome.org/World/lollypop"; - rev = "refs/tags/${version}"; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "World"; + repo = pname; + rev = version; fetchSubmodules = true; - sha256 = "sha256-Rdp0gZjdj2tXOWarsTpqgvSZVXAQsCLfk5oUyalE/ZA="; + sha256 = "sha256-3GPmGNbbSxvLq0t3F9q1x64BwNQCEvFQWLb0bSO9KUY="; }; nativeBuildInputs = [ @@ -59,7 +60,7 @@ python3.pkgs.buildPythonApplication rec { gstreamer gtk3 libhandy - libsoup + libsoup_3 pango totem-pl-parser ] ++ lib.optional lastFMSupport libsecret; @@ -98,7 +99,6 @@ python3.pkgs.buildPythonApplication rec { updateScript = nix-update-script { }; }; - meta = with lib; { changelog = "https://gitlab.gnome.org/World/lollypop/tags/${version}"; description = "A modern music player for GNOME"; From 5381c53ab12bd6adcef94b9829422b52e3d8de9e Mon Sep 17 00:00:00 2001 From: Mahmoud Ayman Date: Tue, 7 Feb 2023 09:15:38 +0200 Subject: [PATCH 054/116] anki-bin: 2.1.56 -> 2.1.57 --- pkgs/games/anki/bin.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/anki/bin.nix b/pkgs/games/anki/bin.nix index 9523a228f878..ef2f0c69ae60 100644 --- a/pkgs/games/anki/bin.nix +++ b/pkgs/games/anki/bin.nix @@ -3,22 +3,22 @@ let pname = "anki-bin"; # Update hashes for both Linux and Darwin! - version = "2.1.56"; + version = "2.1.57"; sources = { linux = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux-qt6.tar.zst"; - sha256 = "sha256-bois8+W/Jvte0HqC6Vi8WcXzrc8y8fKoW3ttbPb/v14="; + sha256 = "sha256-W8EQxvdOQRYHVKoYGu+6LNAHJZGsVQgdvNsRXOBVUKM="; }; # For some reason anki distributes completely separate dmg-files for the aarch64 version and the x86_64 version darwin-x86_64 = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-intel-qt6.dmg"; - sha256 = "sha256-xd96wG+dElf6kSJ3jtdwfDhxJIv2r/o/JF2RcIwaZkg="; + sha256 = "sha256-NhCMmXuZj+Il/hhZZhbk7eLsmbfnqYlSRgw33xIbv8M="; }; darwin-aarch64 = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-apple-qt6.dmg"; - sha256 = "sha256-dYYgKEN6ytZ1CIH2+hK7H7xs3ISMbZGDv3w+Ie+ISlw="; + sha256 = "sha256-8gLtFoqJVvh1NfaSpNeH8+YecMln+A7UyqeSXWVEtmo="; }; }; From f2929eb949dadce3c195fc67f742c0f56710976c Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Thu, 2 Feb 2023 13:19:10 +0100 Subject: [PATCH 055/116] nixos/test-driver: drop logging from Machine.send_monitor_command MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Several machine operations, like `send_chars` and `send_key`, are implemented by calling `send_monitor_command`, possibly multiple times. This generates a huge amount of unnecessary noise in the log, because `send_monitor_command` is a low-level operation and an implementation detail. Here's an excerpt from a highlighted log before and afte the change. Before: subtest: Can generate a PGP key machine: sending keys 'gpg --gen-key\n' machine: sending monitor command: sendkey g machine: waiting for monitor prompt (finished: waiting for monitor prompt, in 0.00 seconds) (finished: sending monitor command: sendkey g, in 0.00 seconds) machine: sending monitor command: sendkey p machine: waiting for monitor prompt (finished: waiting for monitor prompt, in 0.00 seconds) (finished: sending monitor command: sendkey p, in 0.00 seconds) machine: sending monitor command: sendkey g machine: waiting for monitor prompt (finished: waiting for monitor prompt, in 0.00 seconds) (finished: sending monitor command: sendkey g, in 0.00 seconds) machine: sending monitor command: sendkey spc machine: waiting for monitor prompt (finished: waiting for monitor prompt, in 0.00 seconds) (finished: sending monitor command: sendkey spc, in 0.00 seconds) machine: sending monitor command: sendkey 0x0C machine: waiting for monitor prompt (finished: waiting for monitor prompt, in 0.00 seconds) (finished: sending monitor command: sendkey 0x0C, in 0.00 seconds) machine: sending monitor command: sendkey 0x0C machine: waiting for monitor prompt (finished: waiting for monitor prompt, in 0.00 seconds) (finished: sending monitor command: sendkey 0x0C, in 0.00 seconds) machine: sending monitor command: sendkey g machine: waiting for monitor prompt (finished: waiting for monitor prompt, in 0.00 seconds) (finished: sending monitor command: sendkey g, in 0.00 seconds) machine: sending monitor command: sendkey e machine: waiting for monitor prompt (finished: waiting for monitor prompt, in 0.00 seconds) (finished: sending monitor command: sendkey e, in 0.00 seconds) machine: sending monitor command: sendkey n machine: waiting for monitor prompt (finished: waiting for monitor prompt, in 0.00 seconds) (finished: sending monitor command: sendkey n, in 0.00 seconds) machine: sending monitor command: sendkey 0x0C machine: waiting for monitor prompt (finished: waiting for monitor prompt, in 0.00 seconds) (finished: sending monitor command: sendkey 0x0C, in 0.00 seconds) machine: sending monitor command: sendkey k machine: waiting for monitor prompt (finished: waiting for monitor prompt, in 0.00 seconds) (finished: sending monitor command: sendkey k, in 0.00 seconds) machine: sending monitor command: sendkey e machine: waiting for monitor prompt (finished: waiting for monitor prompt, in 0.00 seconds) (finished: sending monitor command: sendkey e, in 0.00 seconds) machine: sending monitor command: sendkey y machine: waiting for monitor prompt (finished: waiting for monitor prompt, in 0.00 seconds) (finished: sending monitor command: sendkey y, in 0.00 seconds) machine: sending monitor command: sendkey ret machine: waiting for monitor prompt (finished: waiting for monitor prompt, in 0.00 seconds) (finished: sending monitor command: sendkey ret, in 0.00 seconds) (finished: sending keys 'gpg --gen-key\n', in 0.15 seconds) After: subtest: Can generate a PGP key machine: sending keys 'gpg --gen-key\n' (finished: sending keys 'gpg --gen-key\n', in 0.15 seconds) --- nixos/lib/test-driver/test_driver/machine.py | 48 ++++++++++---------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/nixos/lib/test-driver/test_driver/machine.py b/nixos/lib/test-driver/test_driver/machine.py index 8f01833bffb4..1c77550bd1fd 100644 --- a/nixos/lib/test-driver/test_driver/machine.py +++ b/nixos/lib/test-driver/test_driver/machine.py @@ -1,4 +1,4 @@ -from contextlib import _GeneratorContextManager +from contextlib import _GeneratorContextManager, nullcontext from pathlib import Path from queue import Queue from typing import Any, Callable, Dict, Iterable, List, Optional, Tuple @@ -406,25 +406,23 @@ class Machine: return rootlog.nested(msg, my_attrs) def wait_for_monitor_prompt(self) -> str: - with self.nested("waiting for monitor prompt"): - assert self.monitor is not None - answer = "" - while True: - undecoded_answer = self.monitor.recv(1024) - if not undecoded_answer: - break - answer += undecoded_answer.decode() - if answer.endswith("(qemu) "): - break - return answer + assert self.monitor is not None + answer = "" + while True: + undecoded_answer = self.monitor.recv(1024) + if not undecoded_answer: + break + answer += undecoded_answer.decode() + if answer.endswith("(qemu) "): + break + return answer def send_monitor_command(self, command: str) -> str: self.run_callbacks() - with self.nested(f"sending monitor command: {command}"): - message = f"{command}\n".encode() - assert self.monitor is not None - self.monitor.send(message) - return self.wait_for_monitor_prompt() + message = f"{command}\n".encode() + assert self.monitor is not None + self.monitor.send(message) + return self.wait_for_monitor_prompt() def wait_for_unit( self, unit: str, user: Optional[str] = None, timeout: int = 900 @@ -685,9 +683,9 @@ class Machine: retry(tty_matches) def send_chars(self, chars: str, delay: Optional[float] = 0.01) -> None: - with self.nested(f"sending keys '{chars}'"): + with self.nested(f"sending keys {repr(chars)}"): for char in chars: - self.send_key(char, delay) + self.send_key(char, delay, log=False) def wait_for_file(self, filename: str) -> None: """Waits until the file exists in machine's file system.""" @@ -860,11 +858,15 @@ class Machine: if matches is not None: return - def send_key(self, key: str, delay: Optional[float] = 0.01) -> None: + def send_key( + self, key: str, delay: Optional[float] = 0.01, log: Optional[bool] = True + ) -> None: key = CHAR_TO_KEY.get(key, key) - self.send_monitor_command(f"sendkey {key}") - if delay is not None: - time.sleep(delay) + context = self.nested(f"sending key {repr(key)}") if log else nullcontext() + with context: + self.send_monitor_command(f"sendkey {key}") + if delay is not None: + time.sleep(delay) def send_console(self, chars: str) -> None: assert self.process From 067d688b1687b731007ddfe58a399f466492efe4 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Thu, 2 Feb 2023 13:26:18 +0100 Subject: [PATCH 056/116] nixos/test-driver: handle decoding errors in Machine.execute MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The output of a command is not guaranteed to be valid UTF-8, so the decoding can fail raising UnicodeDecodeError. If this happens during a `succeeds` the check will be erroneously marked failed. This changes the error handling to the "replace" mode, where invalid codepoints are replaced with � (REPLACEMENT CHARACTER U+FFFD) and the decoding can go on. --- nixos/lib/test-driver/test_driver/machine.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/lib/test-driver/test_driver/machine.py b/nixos/lib/test-driver/test_driver/machine.py index 1c77550bd1fd..0db7930f496b 100644 --- a/nixos/lib/test-driver/test_driver/machine.py +++ b/nixos/lib/test-driver/test_driver/machine.py @@ -545,7 +545,7 @@ class Machine: self.shell.send("echo ${PIPESTATUS[0]}\n".encode()) rc = int(self._next_newline_closed_block_from_shell().strip()) - return (rc, output.decode()) + return (rc, output.decode(errors="replace")) def shell_interact(self, address: Optional[str] = None) -> None: """Allows you to interact with the guest shell for debugging purposes. From fe34d10e57b76696738b3a4a4352480d4e0ffd2f Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Thu, 2 Feb 2023 18:17:40 +0100 Subject: [PATCH 057/116] nixos/tests/gnupg: init --- nixos/tests/all-tests.nix | 1 + nixos/tests/gnupg.nix | 118 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 119 insertions(+) create mode 100644 nixos/tests/gnupg.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index fe51123f1d0f..2ed481ba38cc 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -247,6 +247,7 @@ in { gnome = handleTest ./gnome.nix {}; gnome-flashback = handleTest ./gnome-flashback.nix {}; gnome-xorg = handleTest ./gnome-xorg.nix {}; + gnupg = handleTest ./gnupg.nix {}; go-neb = handleTest ./go-neb.nix {}; gobgpd = handleTest ./gobgpd.nix {}; gocd-agent = handleTest ./gocd-agent.nix {}; diff --git a/nixos/tests/gnupg.nix b/nixos/tests/gnupg.nix new file mode 100644 index 000000000000..65a9a93007fd --- /dev/null +++ b/nixos/tests/gnupg.nix @@ -0,0 +1,118 @@ +import ./make-test-python.nix ({ pkgs, lib, ...}: + +{ + name = "gnupg"; + meta = with lib.maintainers; { + maintainers = [ rnhmjoj ]; + }; + + # server for testing SSH + nodes.server = { ... }: { + imports = [ ../modules/profiles/minimal.nix ]; + + users.users.alice.isNormalUser = true; + services.openssh.enable = true; + }; + + # machine for testing GnuPG + nodes.machine = { pkgs, ... }: { + imports = [ ../modules/profiles/minimal.nix ]; + + users.users.alice.isNormalUser = true; + services.getty.autologinUser = "alice"; + + environment.shellInit = '' + # preset a key passphrase in gpg-agent + preset_key() { + # find all keys + case "$1" in + ssh) grips=$(awk '/^[0-9A-F]/{print $1}' "''${GNUPGHOME:-$HOME/.gnupg}/sshcontrol") ;; + pgp) grips=$(gpg --with-keygrip --list-secret-keys | awk '/Keygrip/{print $3}') ;; + esac + + # try to preset the passphrase for each key found + for grip in $grips; do + "$(gpgconf --list-dirs libexecdir)/gpg-preset-passphrase" -c -P "$2" "$grip" + done + } + ''; + + programs.gnupg.agent.enable = true; + programs.gnupg.agent.enableSSHSupport = true; + }; + + testScript = + '' + import shlex + + + def as_alice(command: str) -> str: + """ + Wraps a command to run it as Alice in a login shell + """ + quoted = shlex.quote(command) + return "su --login alice --command " + quoted + + + start_all() + + with subtest("Wait for the autologin"): + machine.wait_until_tty_matches("1", "alice@machine") + + with subtest("Can generate a PGP key"): + # Note: this needs a tty because of pinentry + machine.send_chars("gpg --gen-key\n") + machine.wait_until_tty_matches("1", "Real name:") + machine.send_chars("Alice\n") + machine.wait_until_tty_matches("1", "Email address:") + machine.send_chars("alice@machine\n") + machine.wait_until_tty_matches("1", "Change") + machine.send_chars("O\n") + machine.wait_until_tty_matches("1", "Please enter") + machine.send_chars("pgp_p4ssphrase\n") + machine.wait_until_tty_matches("1", "Please re-enter") + machine.send_chars("pgp_p4ssphrase\n") + machine.wait_until_tty_matches("1", "public and secret key created") + + with subtest("Confirm the key is in the keyring"): + machine.wait_until_succeeds(as_alice("gpg --list-secret-keys | grep -q alice@machine")) + + with subtest("Can generate and add an SSH key"): + machine.succeed(as_alice("ssh-keygen -t ed25519 -f alice -N ssh_p4ssphrase")) + + # Note: apparently this must be run before using the OpenSSH agent + # socket for the first time in a tty. It's not needed for `ssh` + # because there's a hook that calls it automatically (only in NixOS). + machine.send_chars("gpg-connect-agent updatestartuptty /bye\n") + + # Note: again, this needs a tty because of pinentry + machine.send_chars("ssh-add alice\n") + machine.wait_until_tty_matches("1", "Enter passphrase") + machine.send_chars("ssh_p4ssphrase\n") + machine.wait_until_tty_matches("1", "Please enter") + machine.send_chars("ssh_agent_p4ssphrase\n") + machine.wait_until_tty_matches("1", "Please re-enter") + machine.send_chars("ssh_agent_p4ssphrase\n") + + with subtest("Confirm the SSH key has been registered"): + machine.wait_until_succeeds(as_alice("ssh-add -l | grep -q alice@machine")) + + with subtest("Can preset the key passphrases in the agent"): + machine.succeed(as_alice("echo allow-preset-passphrase > .gnupg/gpg-agent.conf")) + machine.succeed(as_alice("pkill gpg-agent")) + machine.succeed(as_alice("preset_key pgp pgp_p4ssphrase")) + machine.succeed(as_alice("preset_key ssh ssh_agent_p4ssphrase")) + + with subtest("Can encrypt and decrypt a message"): + machine.succeed(as_alice("echo Hello | gpg -e -r alice | gpg -d | grep -q Hello")) + + with subtest("Can log into the server"): + # Install Alice's public key + public_key = machine.succeed(as_alice("cat alice.pub")) + server.succeed("mkdir /etc/ssh/authorized_keys.d") + server.succeed(f"printf '{public_key}' > /etc/ssh/authorized_keys.d/alice") + + server.wait_for_open_port(22) + machine.succeed(as_alice("ssh -i alice -o StrictHostKeyChecking=no server exit")) + ''; +}) From e375feffbefce4961fc6b97aef83e60f9ed0e705 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Thu, 2 Feb 2023 18:21:46 +0100 Subject: [PATCH 058/116] gnupg: add NixOS tests to passthru --- pkgs/tools/security/gnupg/23.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/security/gnupg/23.nix b/pkgs/tools/security/gnupg/23.nix index 2030e8195e68..0f56c4a8c15b 100644 --- a/pkgs/tools/security/gnupg/23.nix +++ b/pkgs/tools/security/gnupg/23.nix @@ -1,5 +1,6 @@ { fetchurl, fetchpatch, lib, stdenv, pkg-config, libgcrypt, libassuan, libksba , libgpg-error, libiconv, npth, gettext, texinfo, buildPackages +, nixosTests , guiSupport ? stdenv.isDarwin, enableMinimal ? false , adns, bzip2, gnutls, libusb1, openldap , pinentry, readline, sqlite, zlib @@ -85,6 +86,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.tests.connman = nixosTests.gnupg; + meta = with lib; { homepage = "https://gnupg.org"; description = "Modern release of the GNU Privacy Guard, a GPL OpenPGP implementation"; From e992053340d076ae6099f0fdb386dc7fa44d5ee2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Feb 2023 07:57:05 +0000 Subject: [PATCH 059/116] deno: 1.30.2 -> 1.30.3 --- pkgs/development/web/deno/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 4e1563f7716a..7dda8b1e7b3f 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -17,15 +17,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.30.2"; + version = "1.30.3"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WpS1pqy6o8FUWMdJpzG5T8xoCkQZ/SbWI4k9vellVb8="; + sha256 = "sha256-Dg4ZX1CpjZuCXDu3GxbaRIwdhDuJ50j53b6XETfFGAU="; }; - cargoSha256 = "sha256-RVoXHrEWMwuC+nD6ypiZzGsYEr/BFReE67z7gqqDOzA="; + cargoSha256 = "sha256-6V9djLUmPEQDewKEN0ND7zyXSrKdakXZdYSRsyXWNuE="; postPatch = '' # upstream uses lld on aarch64-darwin for faster builds From ccbedf5829bbb54bd32a2edac3096e70a1d6c108 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Feb 2023 08:04:58 +0000 Subject: [PATCH 060/116] n8n: 0.214.0 -> 0.214.2 --- .../networking/n8n/node-packages.nix | 178 +++++++++--------- 1 file changed, 89 insertions(+), 89 deletions(-) diff --git a/pkgs/applications/networking/n8n/node-packages.nix b/pkgs/applications/networking/n8n/node-packages.nix index 01afe03fd448..34a86c314000 100644 --- a/pkgs/applications/networking/n8n/node-packages.nix +++ b/pkgs/applications/networking/n8n/node-packages.nix @@ -193,13 +193,22 @@ let sha512 = "UA/8dgLy3+ZiwJjAZHxL4MUB14fFQPkaAOZ94jsTW/Z6WmoOeny2+cLk0+dyIX/iH6qSrEWKwbStEeB970B9pA=="; }; }; - "@azure/msal-browser-2.32.2" = { + "@azure/msal-browser-2.33.0" = { name = "_at_azure_slash_msal-browser"; packageName = "@azure/msal-browser"; - version = "2.32.2"; + version = "2.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.32.2.tgz"; - sha512 = "1YqGzXtPG3QrZPFBKaMWr2WQdukDj+PelqUCv351+p+hlw/AhdRrb8haY73/iqkhT6Cdrbnh7sL4gikVsF4O1g=="; + url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.33.0.tgz"; + sha512 = "c7CVh1tfUfxiWkEIhoIb11hL4PGo4hz0M+gMy34ATagAKdLK7qyEu/5AXJWAf5lz5eE+vQhm7+LKiuETrcXXGw=="; + }; + }; + "@azure/msal-common-10.0.0" = { + name = "_at_azure_slash_msal-common"; + packageName = "@azure/msal-common"; + version = "10.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-10.0.0.tgz"; + sha512 = "/LghpT93jsZLy55QzTsRZWMx6R1Mjc1Aktwps8sKSGE3WbrGwbSsh2uhDlpl6FMcKChYjJ0ochThWwwOodrQNg=="; }; }; "@azure/msal-common-4.5.1" = { @@ -220,15 +229,6 @@ let sha512 = "XqfbglUTVLdkHQ8F9UQJtKseRr3sSnr9ysboxtoswvaMVaEfvyLtMoHv9XdKUfOc0qKGzNgRFd9yRjIWVepl6Q=="; }; }; - "@azure/msal-common-9.1.1" = { - name = "_at_azure_slash_msal-common"; - packageName = "@azure/msal-common"; - version = "9.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-9.1.1.tgz"; - sha512 = "we9xR8lvu47fF0h+J8KyXoRy9+G/fPzm3QEa2TrdR3jaVS3LKAyE2qyMuUkNdbVkvzl8Zr9f7l+IUSP22HeqXw=="; - }; - }; "@azure/msal-node-1.0.0-beta.6" = { name = "_at_azure_slash_msal-node"; packageName = "@azure/msal-node"; @@ -238,13 +238,13 @@ let sha512 = "ZQI11Uz1j0HJohb9JZLRD8z0moVcPks1AFW4Q/Gcl67+QvH4aKEJti7fjCcipEEZYb/qzLSO8U6IZgPYytsiJQ=="; }; }; - "@azure/msal-node-1.14.6" = { + "@azure/msal-node-1.15.0" = { name = "_at_azure_slash_msal-node"; packageName = "@azure/msal-node"; - version = "1.14.6"; + version = "1.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.14.6.tgz"; - sha512 = "em/qqFL5tLMxMPl9vormAs13OgZpmQoJbiQ/GlWr+BA77eCLoL+Ehr5xRHowYo+LFe5b+p+PJVkRvT+mLvOkwA=="; + url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.15.0.tgz"; + sha512 = "fwC5M0c8pxOAzmScPbpx7j28YVTDebUaizlVF7bR0xvlU0r3VWW5OobCcr9ybqKS6wGyO7u4EhXJS9rjRWAuwA=="; }; }; "@azure/storage-blob-12.12.0" = { @@ -1246,13 +1246,13 @@ let sha512 = "erqUpFXksaeR2kejKnhnjZjbFxUpGZx4Z7ydNL9ie8tEhXPiZTsLeUDJ6aR1F8j5wWUAtOAQWUqkc7givBJbBA=="; }; }; - "@types/express-4.17.16" = { + "@types/express-4.17.17" = { name = "_at_types_slash_express"; packageName = "@types/express"; - version = "4.17.16"; + version = "4.17.17"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express/-/express-4.17.16.tgz"; - sha512 = "LkKpqRZ7zqXJuvoELakaFYuETHjZkSol8EV6cNnyishutDBCCdv6+dsKPbKkCcIk57qRphOLY5sEgClw1bO3gA=="; + url = "https://registry.npmjs.org/@types/express/-/express-4.17.17.tgz"; + sha512 = "Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q=="; }; }; "@types/express-jwt-0.0.42" = { @@ -1336,13 +1336,13 @@ let sha512 = "/SNsDidUFCvqqcWDwxv2feww/yqhNeTRL5CVoL3jU4Goc4kKEL10T7Eye65ZqPNi4HRx8sAEX59pV1aEH7drNA=="; }; }; - "@types/node-18.11.18" = { + "@types/node-18.11.19" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "18.11.18"; + version = "18.11.19"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-18.11.18.tgz"; - sha512 = "DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA=="; + url = "https://registry.npmjs.org/@types/node/-/node-18.11.19.tgz"; + sha512 = "YUgMWAQBWLObABqrvx8qKO1enAvBUdjZOAWQ5grBAkp5LQv45jBvYKZ3oFS9iKRCQyFjqw6iuEa1vmFqtxYLZw=="; }; }; "@types/node-fetch-2.6.2" = { @@ -1435,13 +1435,13 @@ let sha512 = "kr90f+ERiQtKWMz5rP32ltJ/BtULDI5RVO0uavn1HQUOwjx0R1h0rnDYNL0CepF1zL5bSY6FISAfd9tOdDhU5Q=="; }; }; - "@types/validator-13.7.11" = { + "@types/validator-13.7.12" = { name = "_at_types_slash_validator"; packageName = "@types/validator"; - version = "13.7.11"; + version = "13.7.12"; src = fetchurl { - url = "https://registry.npmjs.org/@types/validator/-/validator-13.7.11.tgz"; - sha512 = "WqTos+CnAKN64YwyBMhgUYhb5VsTNKwUY6AuzG5qu9/pFZJar/RJFMZBXwX7VS+uzYi+lIAr3WkvuWqEI9F2eg=="; + url = "https://registry.npmjs.org/@types/validator/-/validator-13.7.12.tgz"; + sha512 = "YVtyAPqpefU+Mm/qqnOANW6IkqKpCSrarcyV269C8MA8Ux0dbkEuQwM/4CjL47kVEM2LgBef/ETfkH+c6+moFA=="; }; }; "@types/webidl-conversions-7.0.0" = { @@ -1966,13 +1966,13 @@ let sha512 = "9cYNccliXZDByFsFliVwk5GvTq058Fj513CiR4E60ndDwmuXzTJEp/Bp8FyuRmGyYupLjHLs+JA9/CBoVS4/NQ=="; }; }; - "aws-sdk-2.1308.0" = { + "aws-sdk-2.1310.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1308.0"; + version = "2.1310.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1308.0.tgz"; - sha512 = "tm4UXah8dCqt1geyxrtoyp6dN5QhuLjNeACUZEsffww5oZPMx24EX9dAtvtSu3UfIHwmbR74QomYi1c1u8Jndg=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1310.0.tgz"; + sha512 = "D0m9uFUa1UVXWTe4GSyNJP4+6DXwboE2FEG/URkLoo4r9Q8LHxwNFCGkBhaoEwssREyRe2LOYS1Nag/6WyvC6Q=="; }; }; "aws-sign2-0.7.0" = { @@ -2092,13 +2092,13 @@ let sha512 = "V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ=="; }; }; - "better-sqlite3-8.0.1" = { + "better-sqlite3-8.1.0" = { name = "better-sqlite3"; packageName = "better-sqlite3"; - version = "8.0.1"; + version = "8.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-8.0.1.tgz"; - sha512 = "JhTZjpyapA1icCEjIZB4TSSgkGdFgpWZA2Wszg7Cf4JwJwKQmbvuNnJBeR+EYG/Z29OXvR4G//Rbg31BW/Z7Yg=="; + url = "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-8.1.0.tgz"; + sha512 = "p1m09H+Oi8R9TPj810pdNswMFuVgRNgCJEWypp6jlkOgSwMIrNyuj3hW78xEuBRGok5RzeaUW8aBtTWF3l/TQA=="; }; }; "big-integer-1.6.51" = { @@ -5098,13 +5098,13 @@ let sha512 = "4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw=="; }; }; - "ics-2.41.0" = { + "ics-2.44.0" = { name = "ics"; packageName = "ics"; - version = "2.41.0"; + version = "2.44.0"; src = fetchurl { - url = "https://registry.npmjs.org/ics/-/ics-2.41.0.tgz"; - sha512 = "6oleMfOpdBIrZGMNrTutwW7eFwua8lOkymDNxMXlsVF00HghqH+I3S6frt3a2rfjXTlkI0qiY2rnsKP2JQ9vJA=="; + url = "https://registry.npmjs.org/ics/-/ics-2.44.0.tgz"; + sha512 = "JeiPjNeWkd7Qri/wfHqjZCtglVwRJRqy1MEFKn9QzatzxUyCOsx4YARPlLkU8UnPxpg4VtEjR+VRUG+Cvj6bDg=="; }; }; "ieee754-1.1.13" = { @@ -6466,13 +6466,13 @@ let sha512 = "A9SzX4hMKWS25MyalwcOnNoplyHbkNVsjidhTp8ru0Sj23wY9GWBKS8gAIGDSAqeWjIjvE4KBEl24XXAs+v4wQ=="; }; }; - "logform-2.4.2" = { + "logform-2.5.0" = { name = "logform"; packageName = "logform"; - version = "2.4.2"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/logform/-/logform-2.4.2.tgz"; - sha512 = "W4c9himeAwXEdZ05dQNerhFz2XG80P9Oj0loPUMV23VC2it0orMHQhJm4hdnnor3rd1HsGf6a2lPwBM1zeXHGw=="; + url = "https://registry.npmjs.org/logform/-/logform-2.5.0.tgz"; + sha512 = "fsFiH2yjSCTmzotZ5JmEo0brQyJ7iHrc8pQ5pnHg6e1e5WfkqdNMDvgRWSfz+aCr3Y2YxYzHA4UKj+6QoctKrg=="; }; }; "long-4.0.0" = { @@ -6871,13 +6871,13 @@ let sha512 = "DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="; }; }; - "minipass-4.0.1" = { + "minipass-4.0.2" = { name = "minipass"; packageName = "minipass"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-4.0.1.tgz"; - sha512 = "V9esFpNbK0arbN3fm2sxDKqMYgIp7XtVdE4Esj+PE4Qaaxdg1wIw48ITQIOn1sc8xXSmUviVL3cyjMqPlrVkiA=="; + url = "https://registry.npmjs.org/minipass/-/minipass-4.0.2.tgz"; + sha512 = "4Hbzei7ZyBp+1aw0874YWpKOubZd/jc53/XU+gkYry1QV+VvrbO8icLM5CUtm4F0hyXn85DXYKEMIS26gitD3A=="; }; }; "minipass-collect-1.0.2" = { @@ -7159,22 +7159,22 @@ let sha512 = "Dd6SdWYDjlhgrpPbof4DFPP4hPdpH9cA+3YkFSCgQLNyCi0RdqiQJqPQ5xQFlNVaxd6a7R69RHy/oNwt6/+cLw=="; }; }; - "n8n-editor-ui-0.180.0" = { + "n8n-editor-ui-0.180.2" = { name = "n8n-editor-ui"; packageName = "n8n-editor-ui"; - version = "0.180.0"; + version = "0.180.2"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.180.0.tgz"; - sha512 = "Xbjumqnc9chwVWDulXsIhXZ8r9i1nYUzJGBepC6xNM8kTaCRwCokfxUALfFPGNRUBg/A47ez89TNgDY9Mu/X3w=="; + url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.180.2.tgz"; + sha512 = "5XIIDN6X2CbQtDFwthCOqanvkOgbbFu36h9LZb/eB8KdQKs5dxNFi958lIrKuyZaiPYBQTZCPZWMcqqie+9JIQ=="; }; }; - "n8n-nodes-base-0.212.0" = { + "n8n-nodes-base-0.212.2" = { name = "n8n-nodes-base"; packageName = "n8n-nodes-base"; - version = "0.212.0"; + version = "0.212.2"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.212.0.tgz"; - sha512 = "OENgQkAU70krTAoElQkQTX61Bh/rz2cpip+WDFea+KTXTBqU1gQDNlt3IZdhkS1l0F4e1VfblQawqMeJVFxwbA=="; + url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.212.2.tgz"; + sha512 = "kmuuZOvQ+c84Eap2TW/RUzTZffYznI9fscTUSZYd8xpFdbptIH9TL0pkkcKhybvOC5y0CFPeMKV5JcH0uEujmw=="; }; }; "n8n-workflow-0.135.0" = { @@ -7294,13 +7294,13 @@ let sha512 = "fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg=="; }; }; - "node-abi-3.31.0" = { + "node-abi-3.32.0" = { name = "node-abi"; packageName = "node-abi"; - version = "3.31.0"; + version = "3.32.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-abi/-/node-abi-3.31.0.tgz"; - sha512 = "eSKV6s+APenqVh8ubJyiu/YhZgxQpGP66ntzUb3lY1xB9ukSRaGnx0AIxI+IM+1+IVYC1oWobgG5L3Lt9ARykQ=="; + url = "https://registry.npmjs.org/node-abi/-/node-abi-3.32.0.tgz"; + sha512 = "HkwdiLzE/LeuOMIQq/dJq70oNyRc88+wt5CH/RXYseE00LkA/c4PkS6Ti1vE4OHYUiKjkwuxjWq9pItgrz8UJw=="; }; }; "node-abort-controller-2.0.0" = { @@ -10156,13 +10156,13 @@ let sha512 = "a7wPxPdVlQL7lqvitHGGRsofhdwtkoSXPGATFuSOA2i1ZNQEPLrGnj68vOp2sOJTCFAQVXPeNMX/GctBaO9L2w=="; }; }; - "tinycolor2-1.5.2" = { + "tinycolor2-1.6.0" = { name = "tinycolor2"; packageName = "tinycolor2"; - version = "1.5.2"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.5.2.tgz"; - sha512 = "h80m9GPFGbcLzZByXlNSEhp1gf8Dy+VX/2JCGUZsWLo7lV1mnE/XlxGYgRBoMLJh1lIDXP0EMC4RPTjlRaV+Bg=="; + url = "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.6.0.tgz"; + sha512 = "XPaBkWQJdsf3pLKJV9p4qN/S+fm2Oj8AIPo1BTUhg5oxkvm9+SVEGFdhyOz7tTdUTfvxMiAs4sp6/eZO2Ew+pw=="; }; }; "title-case-3.0.3" = { @@ -10804,13 +10804,13 @@ let sha512 = "ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw=="; }; }; - "vm2-3.9.13" = { + "vm2-3.9.14" = { name = "vm2"; packageName = "vm2"; - version = "3.9.13"; + version = "3.9.14"; src = fetchurl { - url = "https://registry.npmjs.org/vm2/-/vm2-3.9.13.tgz"; - sha512 = "0rvxpB8P8Shm4wX2EKOiMp7H2zq+HUE/UwodY0pCZXs9IffIKZq6vUti5OgkVCTakKo9e/fgO4X1fkwfjWxE3Q=="; + url = "https://registry.npmjs.org/vm2/-/vm2-3.9.14.tgz"; + sha512 = "HgvPHYHeQy8+QhzlFryvSteA4uQLBCOub02mgqdR+0bN/akRZ48TGB1v0aCv7ksyc0HXx16AZtMHKS38alc6TA=="; }; }; "vue-2.6.14" = { @@ -11359,10 +11359,10 @@ in n8n = nodeEnv.buildNodePackage { name = "n8n"; packageName = "n8n"; - version = "0.214.0"; + version = "0.214.2"; src = fetchurl { - url = "https://registry.npmjs.org/n8n/-/n8n-0.214.0.tgz"; - sha512 = "nCwdAvgweOtKOg1ZAMLNoc9PgKBFPHAob3+2mw1UAqV0O+pBFcearssVMczcqiH9yr+PYkL4FKqvrPkB292Iwg=="; + url = "https://registry.npmjs.org/n8n/-/n8n-0.214.2.tgz"; + sha512 = "9KbRJMT8/f4+5kiCnqZbe+ETKdBnBb5VJtw7DUbtu3Uj327dtGlPeX2E/kgXwwonnkO6XgdOteJZDSiixxozbg=="; }; dependencies = [ (sources."@acuminous/bitsyntax-0.1.2" // { @@ -11452,15 +11452,15 @@ in ]; }) sources."@azure/ms-rest-nodeauth-3.1.1" - (sources."@azure/msal-browser-2.32.2" // { + (sources."@azure/msal-browser-2.33.0" // { dependencies = [ - sources."@azure/msal-common-9.1.1" + sources."@azure/msal-common-10.0.0" ]; }) sources."@azure/msal-common-7.6.0" - (sources."@azure/msal-node-1.14.6" // { + (sources."@azure/msal-node-1.15.0" // { dependencies = [ - sources."@azure/msal-common-9.1.1" + sources."@azure/msal-common-10.0.0" ]; }) (sources."@azure/storage-blob-12.12.0" // { @@ -11656,7 +11656,7 @@ in sources."@types/connect-3.4.35" sources."@types/duplexify-3.6.1" sources."@types/es-aggregate-error-1.0.2" - sources."@types/express-4.17.16" + sources."@types/express-4.17.17" sources."@types/express-jwt-0.0.42" sources."@types/express-serve-static-core-4.17.33" sources."@types/express-unless-2.0.1" @@ -11666,7 +11666,7 @@ in sources."@types/long-4.0.2" sources."@types/mime-3.0.1" sources."@types/multer-1.4.7" - sources."@types/node-18.11.18" + sources."@types/node-18.11.19" (sources."@types/node-fetch-2.6.2" // { dependencies = [ sources."form-data-3.0.1" @@ -11681,7 +11681,7 @@ in sources."@types/tough-cookie-2.3.8" sources."@types/tunnel-0.0.3" sources."@types/uuid-9.0.0" - sources."@types/validator-13.7.11" + sources."@types/validator-13.7.12" sources."@types/webidl-conversions-7.0.0" sources."@types/whatwg-url-8.2.2" sources."@vue/compiler-sfc-2.7.14" @@ -11769,7 +11769,7 @@ in }) sources."available-typed-arrays-1.0.5" sources."avsc-5.7.7" - (sources."aws-sdk-2.1308.0" // { + (sources."aws-sdk-2.1310.0" // { dependencies = [ sources."buffer-4.9.2" sources."events-1.1.1" @@ -11800,7 +11800,7 @@ in }) sources."bcrypt-pbkdf-1.0.2" sources."bcryptjs-2.4.3" - sources."better-sqlite3-8.0.1" + sources."better-sqlite3-8.1.0" sources."big-integer-1.6.51" sources."big.js-6.2.1" sources."bignumber.js-2.4.0" @@ -12252,7 +12252,7 @@ in sources."humanize-ms-1.2.1" sources."hyperlinker-1.0.0" sources."iconv-lite-0.6.3" - sources."ics-2.41.0" + sources."ics-2.44.0" sources."ieee754-1.2.1" sources."ignore-5.2.4" (sources."imap-0.8.19" // { @@ -12427,7 +12427,7 @@ in sources."lodash.uniqby-4.7.0" sources."lodash.unset-4.5.2" sources."lodash.zipobject-4.1.3" - sources."logform-2.4.2" + sources."logform-2.5.0" sources."long-4.0.0" sources."lossless-json-1.0.5" (sources."lower-case-2.0.2" // { @@ -12487,7 +12487,7 @@ in ]; }) sources."minimist-1.2.7" - sources."minipass-4.0.1" + sources."minipass-4.0.2" (sources."minipass-collect-1.0.2" // { dependencies = [ sources."minipass-3.3.6" @@ -12581,8 +12581,8 @@ in sources."vue2-boring-avatars-0.3.8" ]; }) - sources."n8n-editor-ui-0.180.0" - (sources."n8n-nodes-base-0.212.0" // { + sources."n8n-editor-ui-0.180.2" + (sources."n8n-nodes-base-0.212.2" // { dependencies = [ sources."chokidar-3.5.2" ]; @@ -12608,7 +12608,7 @@ in sources."tslib-2.5.0" ]; }) - sources."node-abi-3.31.0" + sources."node-abi-3.32.0" sources."node-abort-controller-3.1.1" sources."node-addon-api-4.3.0" sources."node-ensure-0.0.0" @@ -13083,7 +13083,7 @@ in sources."through2-filter-3.0.0" sources."throwback-4.1.0" sources."timeago.js-4.0.2" - sources."tinycolor2-1.5.2" + sources."tinycolor2-1.6.0" (sources."title-case-3.0.3" // { dependencies = [ sources."tslib-2.5.0" @@ -13227,7 +13227,7 @@ in sources."core-util-is-1.0.2" ]; }) - sources."vm2-3.9.13" + sources."vm2-3.9.14" sources."vue-2.7.14" sources."vue-agile-2.0.0" sources."vue-color-2.8.1" From d61f3ee353931a686a1d6a242d66d6fa4a515ace Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Feb 2023 08:14:15 +0000 Subject: [PATCH 061/116] python310Packages.django_treebeard: 4.6.0 -> 4.6.1 --- pkgs/development/python-modules/django_treebeard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django_treebeard/default.nix b/pkgs/development/python-modules/django_treebeard/default.nix index 2728d77d3f80..dd6e054b55c3 100644 --- a/pkgs/development/python-modules/django_treebeard/default.nix +++ b/pkgs/development/python-modules/django_treebeard/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "django-treebeard"; - version = "4.6.0"; + version = "4.6.1"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-frHrcbJCFPLn3DvSFfDDrjL9Z2QXnNR3SveqtJE53qA="; + hash = "sha256-hKs1BAJ31STrd5OeI1VoychWy1I8yWVXk7Zv6aPvRos="; }; propagatedBuildInputs = [ From f1d41d287484f96a8e6f9c5a6eb88c7fa93b4ce3 Mon Sep 17 00:00:00 2001 From: Vanilla Date: Tue, 7 Feb 2023 11:08:44 +0800 Subject: [PATCH 062/116] pbpctrl: init at unstable-2023-02-07 --- pkgs/applications/audio/pbpctrl/default.nix | 34 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/applications/audio/pbpctrl/default.nix diff --git a/pkgs/applications/audio/pbpctrl/default.nix b/pkgs/applications/audio/pbpctrl/default.nix new file mode 100644 index 000000000000..071a4468434c --- /dev/null +++ b/pkgs/applications/audio/pbpctrl/default.nix @@ -0,0 +1,34 @@ +{ rustPlatform +, fetchFromGitHub +, pkg-config +, dbus +, protobuf +, lib +}: + +rustPlatform.buildRustPackage rec { + pname = "pbpctrl"; + + # https://github.com/qzed/pbpctrl/issues/4 + version = "unstable-2023-02-07"; + + src = fetchFromGitHub { + owner = "qzed"; + repo = "${pname}"; + rev = "9fef4bb88046a9f00719b189f8e378c8dbdb8ee6"; + hash = "sha256-8YbsBqqITJ9bKzbGX6d/CSBb8wzr6bDzy8vsyntL1CA="; + }; + + cargoHash = "sha256-ZxJjjaT/ZpEPxvO42UWBy3xW/V5dhXGsKn3KmuM89YA=="; + + nativeBuildInputs = [ pkg-config protobuf ]; + buildInputs = [ dbus ]; + + meta = with lib; { + description = "Control Google Pixel Buds Pro from the Linux command line."; + homepage = "https://github.com/qzed/pbpctrl"; + license = with licenses; [ asl20 mit ]; + maintainers = [ maintainers.vanilla ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d05640bdc94d..06a8ced2df15 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3387,6 +3387,8 @@ with pkgs; passExtensions = recurseIntoAttrs pass.extensions; + pbpctrl = callPackage ../applications/audio/pbpctrl { }; + pdepend = callPackage ../development/php-packages/pdepend { }; platformsh = callPackage ../misc/platformsh { }; From e299ba0a4292b36f09c9a24d0bf7078560b0355a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Feb 2023 10:16:11 +0100 Subject: [PATCH 063/116] ipinfo: 2.10.0 -> 2.10.1 --- pkgs/tools/networking/ipinfo/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/ipinfo/default.nix b/pkgs/tools/networking/ipinfo/default.nix index 0d6c2f617dd2..a05372a1577a 100644 --- a/pkgs/tools/networking/ipinfo/default.nix +++ b/pkgs/tools/networking/ipinfo/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "ipinfo"; - version = "2.10.0"; + version = "2.10.1"; src = fetchFromGitHub { owner = pname; repo = "cli"; - rev = "${pname}-${version}"; - hash = "sha256-oim234254qUWITfgBfB2theMgpVnGHNmrzwE5ULM2M4="; + rev = "refs/tags/${pname}-${version}"; + hash = "sha256-/CW+CmtKc96tVEh5cB6x+/Hb4WnbVi+3AZ0CEao0NE4="; }; vendorSha256 = null; @@ -22,6 +22,7 @@ buildGoModule rec { meta = with lib; { description = "Command Line Interface for the IPinfo API"; homepage = "https://github.com/ipinfo/cli"; + changelog = "https://github.com/ipinfo/cli/releases/tag/ipinfo-${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; From c11c50b70d33b4584acc2ab21edacf876f6edff8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Feb 2023 09:25:50 +0000 Subject: [PATCH 064/116] spotify-player: 0.10.0 -> 0.11.1 --- pkgs/applications/audio/spotify-player/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/spotify-player/default.nix b/pkgs/applications/audio/spotify-player/default.nix index b15031a52914..93a66559bc9a 100644 --- a/pkgs/applications/audio/spotify-player/default.nix +++ b/pkgs/applications/audio/spotify-player/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "spotify-player"; - version = "0.10.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "aome510"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bHPWpx8EJibr2kNuzuGAQPZ0DE6qeJwIRYDy+NFS/PQ="; + sha256 = "sha256-iaDaPjh2wZXxBxBDhWp+hHrJZyXqw6HSzgCzbZj9iho="; }; - cargoSha256 = "sha256-QeQ3PYI5RmbJ+VQ9hLSTXgQXVVoID5zbRqSTrbWzVy8="; + cargoHash = "sha256-I8n/fR1aOsSex2p0u5FaqoJCh2J0oMxkikS9aynxgpA="; nativeBuildInputs = [ pkg-config From 187b686fb96e19e161500cf0abcd4dfc4fd5a293 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Feb 2023 09:26:02 +0000 Subject: [PATCH 065/116] sabnzbd: 3.7.1 -> 3.7.2 --- pkgs/servers/sabnzbd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix index 531a2e31a4b2..a0a6eb72e743 100644 --- a/pkgs/servers/sabnzbd/default.nix +++ b/pkgs/servers/sabnzbd/default.nix @@ -24,14 +24,14 @@ let ]); path = lib.makeBinPath [ par2cmdline unrar unzip p7zip ]; in stdenv.mkDerivation rec { - version = "3.7.1"; + version = "3.7.2"; pname = "sabnzbd"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-Zzqqh/3ijOTVVm5ksmsHY4LOL034VXHeZ7XsEg8cxY0="; + sha256 = "sha256-1gGvdc6TJrkFIrN+TUL/7EejApgpgAQxnQbp8RMknHQ="; }; nativeBuildInputs = [ makeWrapper ]; From acb812207f184cfd3fe79a1730b6fbe92e2077b7 Mon Sep 17 00:00:00 2001 From: Phillip Seeber Date: Tue, 7 Feb 2023 10:39:46 +0100 Subject: [PATCH 066/116] lib/licenses: add ecl20 --- lib/licenses.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index 79303964e9dc..0c4d9d8bc9e1 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -343,6 +343,13 @@ in mkLicense lset) ({ free = false; }; + ecl20 = { + fullName = "Educational Community License, Version 2.0"; + url = "https://opensource.org/licenses/ECL-2.0"; + shortName = "ECL 2.0"; + spdxId = "ECL-2.0"; + }; + efl10 = { spdxId = "EFL-1.0"; fullName = "Eiffel Forum License v1.0"; From 9b291471540484134b54d6f23fd326dbba2ad8f2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Feb 2023 09:40:00 +0000 Subject: [PATCH 067/116] wtwitch: 2.6.0 -> 2.6.1 --- pkgs/tools/video/wtwitch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/video/wtwitch/default.nix b/pkgs/tools/video/wtwitch/default.nix index 0967653464c2..91182c8e179d 100644 --- a/pkgs/tools/video/wtwitch/default.nix +++ b/pkgs/tools/video/wtwitch/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "wtwitch"; - version = "2.6.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "krathalan"; repo = pname; rev = version; - hash = "sha256-KkuXZOquihY3IRVp4FM+AdN3kYi0MqmrXFuNmydTpio="; + hash = "sha256-CHIAxUF0kvt8iV5xRbX5zuOCIecH7NoviQOYiOK0CgY="; }; # hardcode SCRIPT_NAME because #150841 From 0079d432758640d360f95048dc6658acbd742a57 Mon Sep 17 00:00:00 2001 From: Phillip Seeber Date: Tue, 7 Feb 2023 10:40:14 +0100 Subject: [PATCH 068/116] nwchem: init at 7.0.2 --- .../science/chemistry/nwchem/default.nix | 194 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 196 insertions(+) create mode 100644 pkgs/applications/science/chemistry/nwchem/default.nix diff --git a/pkgs/applications/science/chemistry/nwchem/default.nix b/pkgs/applications/science/chemistry/nwchem/default.nix new file mode 100644 index 000000000000..1e76a3059534 --- /dev/null +++ b/pkgs/applications/science/chemistry/nwchem/default.nix @@ -0,0 +1,194 @@ +{ lib +, stdenv +, pkgs +, fetchFromGitHub +, fetchpatch +, which +, openssh +, gcc +, gfortran +, perl +, mpi +, blas +, lapack +, python3 +, tcsh +, bash +, automake +, autoconf +, libtool +, makeWrapper +}: + +assert blas.isILP64 == lapack.isILP64; + +let + versionGA = "5.7.2"; # Fixed by nwchem + + ga_src = fetchFromGitHub { + owner = "GlobalArrays"; + repo = "ga"; + rev = "v${versionGA}"; + sha256 = "0c1y9a5jpdw9nafzfmvjcln1xc2gklskaly0r1alm18ng9zng33i"; + }; + +in +stdenv.mkDerivation rec { + pname = "nwchem"; + version = "7.0.2"; + + src = fetchFromGitHub { + owner = "nwchemgit"; + repo = "nwchem"; + rev = "v${version}-release"; + sha256 = "1ckhcjaw1hzdsmm1x2fva27c4rs3r0h82qivg72v53idz880hbp3"; + }; + + patches = [ + # Fix Python 3.10 compatibility + (fetchpatch { + name = "python3.10"; + url = "https://github.com/nwchemgit/nwchem/commit/638401361c6f294164a4f820ff867a62ac836fd5.patch"; + sha256 = "sha256-yUZb3wWYZm1dX0HwvffksFwhVdb7ix1p8ooJnqiSgEg="; + }) + ]; + + nativeBuildInputs = [ + perl + automake + autoconf + libtool + makeWrapper + gfortran + which + ]; + buildInputs = [ + tcsh + openssh + blas + lapack + python3 + ]; + propagatedBuildInputs = [ mpi ]; + propagatedUserEnvPkgs = [ mpi ]; + + postUnpack = '' + cp -r ${ga_src}/ source/src/tools/ga-${versionGA} + chmod -R u+w source/src/tools/ga-${versionGA} + ''; + + postPatch = '' + find -type f -executable -exec sed -i "s:/bin/csh:${tcsh}/bin/tcsh:" \{} \; + find -type f -name "GNUmakefile" -exec sed -i "s:/usr/bin/gcc:${gcc}/bin/gcc:" \{} \; + find -type f -name "GNUmakefile" -exec sed -i "s:/bin/rm:rm:" \{} \; + find -type f -executable -exec sed -i "s:/bin/rm:rm:" \{} \; + find -type f -name "makelib.h" -exec sed -i "s:/bin/rm:rm:" \{} \; + + # Overwrite script, skipping the download + echo -e '#!/bin/sh\n cd ga-${versionGA};autoreconf -ivf' > src/tools/get-tools-github + + patchShebangs ./ + ''; + + # There is no configure script. Instead the build is controlled via + # environment variables passed to the Makefile + configurePhase = '' + runHook preConfigure + + # config parameters + export NWCHEM_TARGET="LINUX64" + + export ARMCI_NETWORK="MPI-PR" + export USE_MPI="y" + export USE_MPIF="y" + + export NWCHEM_MODULES="all python" + + export USE_PYTHONCONFIG="y" + export USE_PYTHON64="n" + export PYTHONLIBTYPE="so" + export PYTHONHOME="${python3}" + export PYTHONVERSION=${lib.versions.majorMinor python3.version} + + export BLASOPT="-L${blas}/lib -lblas" + export LAPACK_LIB="-L${lapack}/lib -llapack" + export BLAS_SIZE=${if blas.isILP64 then "8" else "4"} + + # extra TCE related options + export MRCC_METHODS="y" + export EACCSD="y" + export IPCCSD="y" + + export NWCHEM_TOP="$(pwd)" + + runHook postConfigure + ''; + + enableParallelBuilding = true; + + preBuild = '' + ln -s ${ga_src} src/tools/ga-${versionGA}.tar.gz + cd src + make nwchem_config + ${lib.optionalString (!blas.isILP64) "make 64_to_32"} + ''; + + postBuild = '' + cd $NWCHEM_TOP/src/util + make version + make + cd $NWCHEM_TOP/src + make link + ''; + + installPhase = '' + mkdir -p $out/bin $out/share/nwchem + + cp $NWCHEM_TOP/bin/LINUX64/nwchem $out/bin/nwchem + cp -r $NWCHEM_TOP/src/data $out/share/nwchem/ + cp -r $NWCHEM_TOP/src/basis/libraries $out/share/nwchem/data + cp -r $NWCHEM_TOP/src/nwpw/libraryps $out/share/nwchem/data + cp -r $NWCHEM_TOP/QA $out/share/nwchem + + wrapProgram $out/bin/nwchem \ + --set-default NWCHEM_BASIS_LIBRARY $out/share/nwchem/data/libraries/ + + cat > $out/share/nwchem/nwchemrc << EOF + nwchem_basis_library $out/share/nwchem/data/libraries/ + nwchem_nwpw_library $out/share/nwchem//data/libraryps/ + ffield amber + amber_1 $out/share/nwchem/data/amber_s/ + amber_2 $out/share/nwchem/data/amber_q/ + amber_3 $out/share/nwchem/data/amber_x/ + amber_4 $out/share/nwchem/data/amber_u/ + spce $out/share/nwchem/data/solvents/spce.rst + charmm_s $out/share/nwchem/data/charmm_s/ + charmm_x $out/share/nwchem/data/charmm_x/ + EOF + ''; + + doCheck = false; + + doInstallCheck = true; + installCheckPhase = '' + export OMP_NUM_THREADS=1 + + # Fix to make mpich run in a sandbox + export HYDRA_IFACE=lo + export OMPI_MCA_rmaps_base_oversubscribe=1 + + # run a simple water test + mpirun -np 2 $out/bin/nwchem $out/share/nwchem/QA/tests/h2o/h2o.nw > h2o.out + grep "Total SCF energy" h2o.out | grep 76.010538 + ''; + + passthru = { inherit mpi; }; + + meta = with lib; { + description = "Open Source High-Performance Computational Chemistry"; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ sheepforce markuskowa ]; + homepage = "https://nwchemgit.github.io"; + license = licenses.ecl20; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b538e2ad58e4..ef2f74ee0077 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36058,6 +36058,8 @@ with pkgs; mopac = callPackage ../applications/science/chemistry/mopac { }; + nwchem = callPackage ../applications/science/chemistry/nwchem { }; + octopus = callPackage ../applications/science/chemistry/octopus { }; openlp = libsForQt5.callPackage ../applications/misc/openlp { }; From d65b2be4e6e8d339b9331696cf70c67009864873 Mon Sep 17 00:00:00 2001 From: Aidan Gauland Date: Tue, 7 Feb 2023 22:44:14 +1300 Subject: [PATCH 069/116] heroic: 2.6.1 -> 2.6.2 --- pkgs/games/heroic/default.nix | 4 ++-- pkgs/games/heroic/package.json | 12 ++++++------ pkgs/games/heroic/yarn.lock | 6 +++--- pkgs/games/heroic/yarn.nix | 8 ++++---- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/games/heroic/default.nix b/pkgs/games/heroic/default.nix index cbab5e8bc6ff..f534f9615473 100644 --- a/pkgs/games/heroic/default.nix +++ b/pkgs/games/heroic/default.nix @@ -10,13 +10,13 @@ mkYarnPackage rec { pname = "heroic-unwrapped"; - version = "2.6.1"; + version = "2.6.2"; src = fetchFromGitHub { owner = "Heroic-Games-Launcher"; repo = "HeroicGamesLauncher"; rev = "v${version}"; - sha256 = "sha256-bU4jvF81GI8a9ACwYn1Hdb5DbpK6GI7z19enO7uu48o="; + sha256 = "sha256-QXciJkY5l5Oqzgnj9vV5IwOSUtVeLMH29r2EIQVt2LI="; }; packageJSON = ./package.json; diff --git a/pkgs/games/heroic/package.json b/pkgs/games/heroic/package.json index 3ef779f644d4..b5f5e0478fd9 100644 --- a/pkgs/games/heroic/package.json +++ b/pkgs/games/heroic/package.json @@ -1,6 +1,6 @@ { "name": "heroic", - "version": "2.6.1", + "version": "2.6.2", "private": true, "main": "build/electron/main.js", "homepage": "./", @@ -39,7 +39,7 @@ } ], "win": { - "artifactName": "${productName}-${version}-Setup.${ext}", + "artifactName": "${productName}-${version}-Setup-${arch}.${ext}", "icon": "build/win_icon.ico", "asarUnpack": [ "build/bin/win32/legendary.exe", @@ -50,7 +50,7 @@ ] }, "portable": { - "artifactName": "${productName}-${version}-Portable.${ext}" + "artifactName": "${productName}-${version}-Portable-${arch}.${ext}" }, "mac": { "artifactName": "${productName}-${version}-macOS-${arch}.${ext}", @@ -175,10 +175,10 @@ "test-watch": "jest --watch --maxWorkers=25%", "test:ci": "jest --runInBand --silent", "release:linux": "vite build && electron-builder -p always --linux deb AppImage rpm pacman tar.xz", - "release:mac": "vite build && electron-builder -p always --mac", - "release:win": "vite build && electron-builder -p always --win nsis portable", + "release:mac": "vite build && electron-builder -p always --mac --x64 --arm64", + "release:win": "vite build && electron-builder -p never --win nsis portable --x64 --arm64", "dist:linux": "vite build && electron-builder --linux", - "dist:mac": "vite build && electron-builder --mac --x64 --arm64", + "dist:mac": "vite build && electron-builder --mac", "dist:win": "vite build && electron-builder --win", "dist:flatpak": "yarn dist:linux appimage && yarn flatpak:prepare && yarn flatpak:build", "lint": "eslint --cache -c .eslintrc --ext .tsx,ts ./src", diff --git a/pkgs/games/heroic/yarn.lock b/pkgs/games/heroic/yarn.lock index 94cdf1017310..8e865bd6c9c7 100644 --- a/pkgs/games/heroic/yarn.lock +++ b/pkgs/games/heroic/yarn.lock @@ -4272,9 +4272,9 @@ htmlparser2@^8.0.1: entities "^4.3.0" http-cache-semantics@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390" - integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ== + version "4.1.1" + resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a" + integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ== http-proxy-agent@^5.0.0: version "5.0.0" diff --git a/pkgs/games/heroic/yarn.nix b/pkgs/games/heroic/yarn.nix index da55adf2c631..dd85f32653c8 100644 --- a/pkgs/games/heroic/yarn.nix +++ b/pkgs/games/heroic/yarn.nix @@ -4496,11 +4496,11 @@ }; } { - name = "http_cache_semantics___http_cache_semantics_4.1.0.tgz"; + name = "http_cache_semantics___http_cache_semantics_4.1.1.tgz"; path = fetchurl { - name = "http_cache_semantics___http_cache_semantics_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz"; - sha512 = "carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="; + name = "http_cache_semantics___http_cache_semantics_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz"; + sha512 = "er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ=="; }; } { From 98a611259f2206d8c42a414d89494f6ae4aa0642 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 7 Feb 2023 19:44:47 +1000 Subject: [PATCH 070/116] nix-eval-jobs: 2.12.1 -> 2.13.0 https://github.com/nix-community/nix-eval-jobs/releases/tag/v2.13.0 --- pkgs/tools/package-management/nix-eval-jobs/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/package-management/nix-eval-jobs/default.nix b/pkgs/tools/package-management/nix-eval-jobs/default.nix index cfc23ff619dc..3d42d4907e79 100644 --- a/pkgs/tools/package-management/nix-eval-jobs/default.nix +++ b/pkgs/tools/package-management/nix-eval-jobs/default.nix @@ -11,12 +11,12 @@ }: stdenv.mkDerivation rec { pname = "nix-eval-jobs"; - version = "2.12.1"; + version = "2.13.0"; src = fetchFromGitHub { owner = "nix-community"; repo = pname; rev = "v${version}"; - hash = "sha256-8nFseSTAIGJdB4P/K/cXAehvdrSLcTTBZLQNs/ZC+I8="; + hash = "sha256-O0Ro9vwf2kDhGFs32puQIeW/rSSduC9sD5zV8e/GtvA="; }; buildInputs = [ boost diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4b03492c2a92..0867fa0523c2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37818,9 +37818,7 @@ with pkgs; dnadd = callPackage ../tools/nix/dnadd { }; - nix-eval-jobs = callPackage ../tools/package-management/nix-eval-jobs { - nix = nixVersions.nix_2_12; # fails to build with 2.13 - }; + nix-eval-jobs = callPackage ../tools/package-management/nix-eval-jobs { }; nix-doc = callPackage ../tools/package-management/nix-doc { }; From fab09085df1b60d6a0870c8a89ce26d5a4a708c2 Mon Sep 17 00:00:00 2001 From: Tim Fenney Date: Tue, 7 Feb 2023 02:48:31 -0700 Subject: [PATCH 071/116] doc/nixos: prefer the verb 'log in' (#214616) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * doc/nixos: prefer the term 'login' Change "re-log" to "login again." * Update nixos/doc/manual/configuration/xfce.chapter.md Co-authored-by: Naïm Favier * Change also xml. --------- Co-authored-by: Naïm Favier --- nixos/doc/manual/configuration/xfce.chapter.md | 2 +- nixos/doc/manual/from_md/configuration/xfce.chapter.xml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/configuration/xfce.chapter.md b/nixos/doc/manual/configuration/xfce.chapter.md index c331e63cfe54..60771b36fa9c 100644 --- a/nixos/doc/manual/configuration/xfce.chapter.md +++ b/nixos/doc/manual/configuration/xfce.chapter.md @@ -54,4 +54,4 @@ run this command to do the same thing. $ xfconf-query -c xfce4-session -p /compat/LaunchGNOME -s true ``` -A log-out and re-log will be needed for this to take effect. +It is necessary to log out and log in again for this to take effect. diff --git a/nixos/doc/manual/from_md/configuration/xfce.chapter.xml b/nixos/doc/manual/from_md/configuration/xfce.chapter.xml index 7ec69b5e9b8f..22a5d9875ffe 100644 --- a/nixos/doc/manual/from_md/configuration/xfce.chapter.xml +++ b/nixos/doc/manual/from_md/configuration/xfce.chapter.xml @@ -63,7 +63,8 @@ Thunar:2410): GVFS-RemoteVolumeMonitor-WARNING **: remote volume monitor with db $ xfconf-query -c xfce4-session -p /compat/LaunchGNOME -s true - A log-out and re-log will be needed for this to take effect. + It is necessary to log out and log in again for this to take + effect. From 64e33d695e9555b7eb43afa0f0355dfe927e385a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Feb 2023 10:49:42 +0100 Subject: [PATCH 072/116] python310Packages.bluetooth-sensor-state-data: 1.6.0 -> 1.6.1 Diff: https://github.com/Bluetooth-Devices/bluetooth-sensor-state-data/compare/v1.6.0...v1.6.1 --- .../python-modules/bluetooth-sensor-state-data/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix b/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix index 21bdad355c06..65a5fc6444ec 100644 --- a/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix +++ b/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "bluetooth-sensor-state-data"; - version = "1.6.0"; + version = "1.6.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-Btfya9l1UX7GbiUxuaFHT0l+pG+Dg5X0L2JS+1/VYOo="; + hash = "sha256-3qZlk6zV/AeFG4OSRONQ7EMw9Kk/yHjVHV2o64bxCGM="; }; nativeBuildInputs = [ From 0fdd8416ebefe83efcf957c9f125a0711c715c70 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Feb 2023 10:50:20 +0100 Subject: [PATCH 073/116] python310Packages.bluemaestro-ble: 0.2.1 -> 0.2.3 Diff: https://github.com/Bluetooth-Devices/bluemaestro-ble/compare/refs/tags/v0.2.1...v0.2.3 Changelog: https://github.com/Bluetooth-Devices/bluemaestro-ble/blob/v0.2.3/CHANGELOG.md --- pkgs/development/python-modules/bluemaestro-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bluemaestro-ble/default.nix b/pkgs/development/python-modules/bluemaestro-ble/default.nix index 11edb88848b3..d6eb12166a8a 100644 --- a/pkgs/development/python-modules/bluemaestro-ble/default.nix +++ b/pkgs/development/python-modules/bluemaestro-ble/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "bluemaestro-ble"; - version = "0.2.1"; + version = "0.2.3"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-QGad5o9JZ6ansVh3bRBO+9mE4PKw05acY+9+Ur2OBsY="; + hash = "sha256-mJ5JNGN4F9U3WMJQDwiZwuxE0zOirwo1sWF3/bVwXhY="; }; nativeBuildInputs = [ From c7ae55ea146a724abadb2b62f3aad784c0b54063 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Feb 2023 11:21:15 +0100 Subject: [PATCH 074/116] python310Packages.pydeps: 1.11.0 -> 1.11.1 Diff: https://github.com/thebjorn/pydeps/compare/refs/tags/v1.11.0...v1.11.1 Changelog: https://github.com/thebjorn/pydeps/releases/tag/v1.11.1 --- pkgs/development/python-modules/pydeps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydeps/default.nix b/pkgs/development/python-modules/pydeps/default.nix index ef5339086f63..aefb4cc43f54 100644 --- a/pkgs/development/python-modules/pydeps/default.nix +++ b/pkgs/development/python-modules/pydeps/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pydeps"; - version = "1.11.0"; + version = "1.11.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "thebjorn"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-XAx7B3v+7xYiW15nJgiL82YlNeBxW80M0Rq0LMMsWu0="; + hash = "sha256-nFdt68QhpX1URLEQtdikR11KFK9E9Y+cTvJQn4/YZlI="; }; buildInputs = [ From 7d6f5302531275d7f20711da2875fe7da294895d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Feb 2023 11:20:35 +0100 Subject: [PATCH 075/116] terrascan: 1.17.1 -> 1.18.0 Diff: https://github.com/accurics/terrascan/compare/v1.17.1...v1.18.0 --- pkgs/tools/security/terrascan/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/terrascan/default.nix b/pkgs/tools/security/terrascan/default.nix index bc694986c8d1..fcd1487dfb5d 100644 --- a/pkgs/tools/security/terrascan/default.nix +++ b/pkgs/tools/security/terrascan/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "terrascan"; - version = "1.17.1"; + version = "1.18.0"; src = fetchFromGitHub { owner = "accurics"; repo = pname; - rev = "v${version}"; - hash = "sha256-XcMDdnqx64UcEzD44z34sm5TmshPOTb5tivBnGXQLjo="; + rev = "refs/tags/v${version}"; + hash = "sha256-EzdyJzUPoWcLux6RiEZL3DiB65T+pgY70bpD1fX1JN4="; }; - vendorHash = "sha256-HjWUV5gfh2WnUAayZIj6LGFs0rMv2n7v6zJJrzBHBwg="; + vendorHash = "sha256-yTndvnlCmXsQSpImcwuwSXB0WuF2naGJEHfU1iAJApM="; # Tests want to download a vulnerable Terraform project doCheck = false; From 6cbed32ddf358d978f9e5adc79a963b651eb0484 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Feb 2023 11:26:22 +0100 Subject: [PATCH 076/116] python310Packages.types-colorama: 0.4.15.5 -> 0.4.15.7 --- pkgs/development/python-modules/types-colorama/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-colorama/default.nix b/pkgs/development/python-modules/types-colorama/default.nix index 155b18f02841..0a059b252b52 100644 --- a/pkgs/development/python-modules/types-colorama/default.nix +++ b/pkgs/development/python-modules/types-colorama/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-colorama"; - version = "0.4.15.5"; + version = "0.4.15.7"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-PSqJbsfz0fZpz3ruoO9+usRznwLbM6sTKB5qcewvwsU="; + hash = "sha256-2oToq+lcLhGtKyi6VXq45dyAhjvW+HOefBkWyVB1WvQ="; }; # Module has no tests From 96b73bcdc5cc020ff3a9d926bda6739a054b129c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Feb 2023 11:27:11 +0100 Subject: [PATCH 077/116] python310Packages.types-requests: 2.28.11.8 -> 2.28.11.11 --- pkgs/development/python-modules/types-requests/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index 274e69ca7768..a6d685a5371e 100644 --- a/pkgs/development/python-modules/types-requests/default.nix +++ b/pkgs/development/python-modules/types-requests/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.28.11.8"; + version = "2.28.11.11"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-5nQkUl+ErfvqtyaKFZ08Yzhi2vrhXFsZVHzhtVlU8KM="; + sha256 = "sha256-GWIqzjWl2hg47pytDfSlDH46Qg+KN+g1fOhw/tSS+oE="; }; propagatedBuildInputs = [ From 9c17022fde212e81abc4d822dbee27a0d157b30e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Feb 2023 11:28:06 +0100 Subject: [PATCH 078/116] python310Packages.types-urllib3: 1.26.25.4 -> 1.26.25.5 --- pkgs/development/python-modules/types-urllib3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-urllib3/default.nix b/pkgs/development/python-modules/types-urllib3/default.nix index 55ab0f9ee1e5..8b16993877b3 100644 --- a/pkgs/development/python-modules/types-urllib3/default.nix +++ b/pkgs/development/python-modules/types-urllib3/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-urllib3"; - version = "1.26.25.4"; + version = "1.26.25.5"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-7sVVZCjuyGKxrFePtpqrOHeZWpn/7J5aEs9/vQzJ2u4="; + hash = "sha256-VjDleCRtFw2R6+OQF4jNKNU8TgRNwuJIjjsNVftoldg="; }; # Module doesn't have tests From 7ed2357267811eb50882b8853e94275ea0c4d89e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Feb 2023 11:29:02 +0100 Subject: [PATCH 079/116] python310Packages.types-docutils: 0.19.1.2 -> 0.19.1.3 --- pkgs/development/python-modules/types-docutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-docutils/default.nix b/pkgs/development/python-modules/types-docutils/default.nix index 31906b220af2..33e80f489521 100644 --- a/pkgs/development/python-modules/types-docutils/default.nix +++ b/pkgs/development/python-modules/types-docutils/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-docutils"; - version = "0.19.1.2"; + version = "0.19.1.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-yj0hNUhK21LdBCu929bt3LvajGCLo/Xl+Qi9VI/8s5k="; + hash = "sha256-Nv4w3lbx7OGp96mQ1H2qeBta+DHSs/Lct9/QG4V8w9Q="; }; # Module doesn't have tests From 21c2b0df2e6e43358901444f523dcd3a34666127 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Feb 2023 10:41:49 +0000 Subject: [PATCH 080/116] httm: 0.20.4 -> 0.20.5 --- pkgs/tools/filesystems/httm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/httm/default.nix b/pkgs/tools/filesystems/httm/default.nix index 07d507e2923a..5a917602c43b 100644 --- a/pkgs/tools/filesystems/httm/default.nix +++ b/pkgs/tools/filesystems/httm/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "httm"; - version = "0.20.4"; + version = "0.20.5"; src = fetchFromGitHub { owner = "kimono-koans"; repo = pname; rev = version; - sha256 = "sha256-PmfyULkB93PvouOWp96F4YXyNFQqRmoy6LpOFGz0EZk="; + sha256 = "sha256-8SizRNjA+lvp8ZD14SoRcymhYmJXlwoeZQjrekIbdL4="; }; - cargoHash = "sha256-L5/qOnyxfj3KfcZDI9Xp2IgE33P8yzQjVg6+4jmGQyM="; + cargoHash = "sha256-tXV1G0qWN0jLOKlnZfHHlOZw+wUItLzQtSg4o2f96u0="; nativeBuildInputs = [ installShellFiles ]; From 58c9772bb79885caf42309d430363e09a9dcd9aa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Feb 2023 11:03:11 +0000 Subject: [PATCH 081/116] jackett: 0.20.2916 -> 0.20.2986 --- pkgs/servers/jackett/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 5ef1b2326044..dc93a7977ad8 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.20.2916"; + version = "0.20.2986"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha512-tYIPpEAqN+ENYN/NJcGWnk3NpJm0MeTBwAp7nu21QWED88sKkHatM/z+puibWxM46WMb7kyPtCmyA//aP08mJQ=="; + hash = "sha512-IbcIn2n5Cob+Ewp0lkkIENuo00HBlNy6V5pKARC6EgBDRKbB+YXETDX1Ko3Dsl0x6mxZgoTCbzEIPxD+Y2J4Rw=="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; From e92f95ae36286451f4d306c6bc5b9001a029d09f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Feb 2023 11:03:22 +0000 Subject: [PATCH 082/116] glooctl: 1.13.4 -> 1.13.5 --- pkgs/applications/networking/cluster/glooctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/glooctl/default.nix b/pkgs/applications/networking/cluster/glooctl/default.nix index 5c47c602c33f..2077549095ce 100644 --- a/pkgs/applications/networking/cluster/glooctl/default.nix +++ b/pkgs/applications/networking/cluster/glooctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "glooctl"; - version = "1.13.4"; + version = "1.13.5"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-eyfMWum1fZUq4iF77Q+0FP2Rdq2P+xK0au3ytN8MS+k="; + hash = "sha256-mBmjGP7O1uX+uVM4/us4RWeJcXB1lSEvZQWT/3Ygzik="; }; subPackages = [ "projects/gloo/cli/cmd" ]; From b9ca51f3c1e2b276586e15340d8f83bf8c379d7d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Feb 2023 11:18:43 +0000 Subject: [PATCH 083/116] lxgw-neoxihei: 1.005 -> 1.006 --- pkgs/data/fonts/lxgw-neoxihei/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/lxgw-neoxihei/default.nix b/pkgs/data/fonts/lxgw-neoxihei/default.nix index 9d05689657e0..3ae29a8e2a41 100644 --- a/pkgs/data/fonts/lxgw-neoxihei/default.nix +++ b/pkgs/data/fonts/lxgw-neoxihei/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation rec { pname = "lxgw-neoxihei"; - version = "1.005"; + version = "1.006"; src = fetchurl { url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf"; - hash = "sha256-IvbbeBjpFz9zHt3mHu5vY8sLETKnvOMv7eHjANQ2GlA="; + hash = "sha256-n7TTunWOHGWLxvs75r5My1il0KELOZbAgTGqtMpQ+mQ="; }; dontUnpack = true; From 4f77f9a0f4e4c9c5c9d19cf9621b618ab4f39884 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Tue, 7 Feb 2023 12:21:35 +0100 Subject: [PATCH 084/116] qgis-ltr: 3.22.15 -> 3.22.16 --- pkgs/applications/gis/qgis/unwrapped-ltr.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix index 1f78d5398596..a2e01303970a 100644 --- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -73,14 +73,14 @@ let six ]; in mkDerivation rec { - version = "3.22.15"; + version = "3.22.16"; pname = "qgis-ltr-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-0hly1yZ7NAcSe84XMwDlcmZPunPcNXYzvAhd0Z5rB0Q="; + hash = "sha256-6UpWVEyh94Oo6eI/dEmDuJHRwpPtkEsksjE90iAUgo8="; }; passthru = { From f98c4eac33a53652203b4196761aa29f92d7572b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Tue, 7 Feb 2023 12:32:51 +0100 Subject: [PATCH 085/116] doc/stdenv: fixup #212642 --- doc/stdenv/stdenv.chapter.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index a12d68c0934f..0d159233a932 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -626,7 +626,7 @@ Before and after running `make`, the hooks `preBuild` and `postBuild` are called ### The check phase {#ssec-check-phase} -The check phase checks whether the package was built correctly by running its test suite. The default `checkPhase` calls `make $checkTarget`, but only if the `doCheck` variable is enabled (see below). +The check phase checks whether the package was built correctly by running its test suite. The default `checkPhase` calls `make $checkTarget`, but only if the [`doCheck` variable](#var-stdenv-doCheck) is enabled. #### Variables controlling the check phase {#variables-controlling-the-check-phase} @@ -646,7 +646,8 @@ See the [build phase](#var-stdenv-makeFlags) for details. ##### `checkTarget` {#var-stdenv-checkTarget} -The make target that runs the tests. Defaults to `check` if it exists, otherwise `test`; if neither is found, do nothing. +The `make` target that runs the tests. +If unset, use `check` if it exists, otherwise `test`; if neither is found, do nothing. ##### `checkFlags` / `checkFlagsArray` {#var-stdenv-checkFlags} From f79ffab8e43f867a36831dfc21da9df91800300b Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 7 Feb 2023 13:09:02 +0100 Subject: [PATCH 086/116] unciv: 4.4.9 -> 4.4.11 --- pkgs/games/unciv/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/unciv/default.nix b/pkgs/games/unciv/default.nix index 09d2d52874e2..97976f9d66f2 100644 --- a/pkgs/games/unciv/default.nix +++ b/pkgs/games/unciv/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "unciv"; - version = "4.4.9"; + version = "4.4.11"; src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - sha256 = "sha256-8OoQgiMrjYPlEjvm/9m7YkMaKyGBtNBkGavjACwY/00="; + hash = "sha256-UvTEqptA9Dp1wdri12sAYDB6rjiZCvk2tiG5i0AWU78="; }; dontUnpack = true; @@ -55,6 +55,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ tex ]; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.mpl20; - platforms = [ "x86_64-linux" ]; + platforms = platforms.all; }; } From 7f41ad6c6c2f5859e167ed3123e44af5e0073656 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 7 Feb 2023 13:10:41 +0100 Subject: [PATCH 087/116] xorg.xorgserver: patch CVE-2023-0494 https://lists.x.org/archives/xorg/2023-February/061255.html --- pkgs/servers/x11/xorg/overrides.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index b0530977f7e2..4ca747798a78 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -861,6 +861,11 @@ self: super: url = "https://gitlab.freedesktop.org/xorg/xserver/-/commit/ccdd431cd8f1cabae9d744f0514b6533c438908c.diff"; sha256 = "sha256-IGPsjS7KgRPLrs1ImBXvIFCa8Iu5ZiAHRZvHlBYP8KQ="; }) + (fetchpatch { + name = "CVE-2023-0494.diff"; + url = "https://gitlab.freedesktop.org/xorg/xserver/-/commit/0ba6d8c37071131a49790243cdac55392ecf71ec.diff"; + sha256 = "sha256-/+IuGk09OYVEIB/Y+DTKf7kfHyukEFX/6u1FDIGJieY="; + }) ]; buildInputs = commonBuildInputs ++ [ libdrm mesa ]; propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ libpciaccess libepoxy ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [ From 40ab60b3179d9c688c87427ae011d0987f2399df Mon Sep 17 00:00:00 2001 From: John Rinehart Date: Tue, 7 Feb 2023 12:18:31 +0000 Subject: [PATCH 088/116] perlPackages.AppSqitch: 1.1.0 -> 1.3.1 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 96eca64590d2..9523f0953eaa 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -915,11 +915,11 @@ let }; AppSqitch = buildPerlModule { - version = "1.1.0"; + version = "1.3.1"; pname = "App-Sqitch"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DW/DWHEELER/App-Sqitch-v1.1.0.tar.gz"; - hash = "sha256-7hRs111jAIN+bKVZuwveJH1CEjyWssXUsoAPONPj0as="; + url = "mirror://cpan/authors/id/D/DW/DWHEELER/App-Sqitch-v1.3.1.tar.gz"; + hash = "sha256-9edo0pjNQEfuKuQjGXgujCzaMSc3vL2/r1gL1H7+i5Q="; }; buildInputs = [ CaptureTiny TestDeep TestDir TestException TestFile TestFileContents TestMockModule TestMockObject TestNoWarnings TestWarn ]; propagatedBuildInputs = [ Clone ConfigGitLike DBI DateTime EncodeLocale HashMerge IOPager IPCRun3 IPCSystemSimple ListMoreUtils PathClass PerlIOutf8_strict PodParser StringFormatter StringShellQuote TemplateTiny Throwable TypeTiny URIdb libintl-perl ]; From 24e6cc417e3067dd7e9a8b7d72d5614fbd6fd23d Mon Sep 17 00:00:00 2001 From: John Rinehart Date: Mon, 6 Feb 2023 21:55:31 +0000 Subject: [PATCH 089/116] =?UTF-8?q?perlPackages.TemplateToolkit:=203.009?= =?UTF-8?q?=20=E2=86=92=203.101?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9523f0953eaa..8f3732c50d57 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -22907,10 +22907,10 @@ let TemplateToolkit = buildPerlPackage { pname = "Template-Toolkit"; - version = "3.009"; + version = "3.101"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AT/ATOOMIC/Template-Toolkit-3.009.tar.gz"; - hash = "sha256-1q0ju/Y3pZtd/RrABkYN/LGFmC5IUs3ncVD70IXx9bY="; + url = "mirror://cpan/authors/id/A/AB/ABW/Template-Toolkit-3.101.tar.gz"; + hash = "sha256-0qMt1sIeSzfGqT34CHyp6IDPrmE6Pl766jB7C9yu21g="; }; doCheck = !stdenv.isDarwin; propagatedBuildInputs = [ AppConfig ]; From 5952d4bc10d394cdce31a581e67a52ee6533d66d Mon Sep 17 00:00:00 2001 From: John Rinehart Date: Mon, 6 Feb 2023 21:56:25 +0000 Subject: [PATCH 090/116] perlPackages.AppSqitch: add Template-Toolkit support --- pkgs/development/tools/misc/sqitch/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/sqitch/default.nix b/pkgs/development/tools/misc/sqitch/default.nix index f941ab05e288..ae880ceb8ba4 100644 --- a/pkgs/development/tools/misc/sqitch/default.nix +++ b/pkgs/development/tools/misc/sqitch/default.nix @@ -5,13 +5,15 @@ , shortenPerlShebang , mysqlSupport ? false , postgresqlSupport ? false +, templateToolkitSupport ? false }: let sqitch = perlPackages.AppSqitch; modules = with perlPackages; [ ] ++ lib.optional mysqlSupport DBDmysql - ++ lib.optional postgresqlSupport DBDPg; + ++ lib.optional postgresqlSupport DBDPg + ++ lib.optional templateToolkitSupport TemplateToolkit; in stdenv.mkDerivation { From 6e7eaa312978e581a392c0d2c8eb4ba9fe759820 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Feb 2023 13:38:57 +0100 Subject: [PATCH 091/116] python310Packages.oralb-ble: 0.17.2 -> 0.17.4 Diff: https://github.com/Bluetooth-Devices/oralb-ble/compare/refs/tags/v0.17.2...v0.17.4 Changelog: https://github.com/Bluetooth-Devices/oralb-ble/releases/tag/v0.17.4 --- pkgs/development/python-modules/oralb-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oralb-ble/default.nix b/pkgs/development/python-modules/oralb-ble/default.nix index 743fdd82f600..c0f2840763ea 100644 --- a/pkgs/development/python-modules/oralb-ble/default.nix +++ b/pkgs/development/python-modules/oralb-ble/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "oralb-ble"; - version = "0.17.2"; + version = "0.17.4"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-v2c1FoLgG6HH02d+YBr4Qh12ztRsiwWyueUNOBpWqPM="; + hash = "sha256-KvvcyeYXBtV/sUKMv+1xoXH9ALUX46EWS/STFZkCnUQ="; }; nativeBuildInputs = [ From cb51e4eea43d96db06a2fffa3786dc73cea05a2f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Feb 2023 13:39:36 +0100 Subject: [PATCH 092/116] python310Packages.thermopro-ble: 0.4.3 -> 0.4.5 Diff: https://github.com/bluetooth-devices/thermopro-ble/compare/refs/tags/v0.4.3...v0.4.5 --- pkgs/development/python-modules/thermopro-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/thermopro-ble/default.nix b/pkgs/development/python-modules/thermopro-ble/default.nix index ee2a4fb2e757..ad934e71e364 100644 --- a/pkgs/development/python-modules/thermopro-ble/default.nix +++ b/pkgs/development/python-modules/thermopro-ble/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "thermopro-ble"; - version = "0.4.3"; + version = "0.4.5"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "bluetooth-devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-y8Uh1REZqfrS3Y/L/uCmHYkdPQzwzdx7eSz003oz05o="; + hash = "sha256-z3RrPOV7NGl3aNor+baeVivn+DKwYHcrdlM5sNMGVD0="; }; nativeBuildInputs = [ From e6b61828e7a3cb032d2ad175e12f0e9285c4e340 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Feb 2023 13:39:56 +0100 Subject: [PATCH 093/116] python310Packages.xiaomi-ble: 0.15.0 -> 0.16.1 Diff: https://github.com/Bluetooth-Devices/xiaomi-ble/compare/refs/tags/v0.15.0...v0.16.1 Changelog: https://github.com/Bluetooth-Devices/xiaomi-ble/releases/tag/v0.16.1 --- pkgs/development/python-modules/xiaomi-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xiaomi-ble/default.nix b/pkgs/development/python-modules/xiaomi-ble/default.nix index c868801e2d4e..7815a36396be 100644 --- a/pkgs/development/python-modules/xiaomi-ble/default.nix +++ b/pkgs/development/python-modules/xiaomi-ble/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "xiaomi-ble"; - version = "0.15.0"; + version = "0.16.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-6j5hZ9NGmAFpbgYTyC4UuI4XkQwotZND1UMHnmJHCdo="; + hash = "sha256-JsrOt6LmmhJZ4MBwLVKKt3IMbvAnxJx70AZROhb9gbc="; }; nativeBuildInputs = [ From 23fff24ee773c1a338b4de53338f4a7a4e4e6cc5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Feb 2023 13:40:10 +0100 Subject: [PATCH 094/116] python310Packages.tilt-ble: 0.2.3 -> 0.2.4 Diff: https://github.com/Bluetooth-Devices/tilt-ble/compare/v0.2.3...v0.2.4 --- pkgs/development/python-modules/tilt-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tilt-ble/default.nix b/pkgs/development/python-modules/tilt-ble/default.nix index c4164ce07003..4b9f751f2d60 100644 --- a/pkgs/development/python-modules/tilt-ble/default.nix +++ b/pkgs/development/python-modules/tilt-ble/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "tilt-ble"; - version = "0.2.3"; + version = "0.2.4"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-PR+BA0wUljUeUYCTRMKxkG+kj6PfklksbO/k9L7sWdE="; + hash = "sha256-ok9XWx47hcke535480NORfS1pSagaOJvMR48lYTa/Tg="; }; nativeBuildInputs = [ From db4c45d50e402007579e06112b167bd1499c56d6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Feb 2023 13:40:29 +0100 Subject: [PATCH 095/116] python310Packages.sensorpush-ble: 1.5.2 -> 1.5.5 Diff: https://github.com/Bluetooth-Devices/sensorpush-ble/compare/v1.5.2...v1.5.5 --- pkgs/development/python-modules/sensorpush-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sensorpush-ble/default.nix b/pkgs/development/python-modules/sensorpush-ble/default.nix index 3567b178bb95..821ba9577cb1 100644 --- a/pkgs/development/python-modules/sensorpush-ble/default.nix +++ b/pkgs/development/python-modules/sensorpush-ble/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "sensorpush-ble"; - version = "1.5.2"; + version = "1.5.5"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-64DywtZwfDFjW8WUzw3ZTT462sBGFgAHGc0bGnKCJpY="; + hash = "sha256-17Yzpbcy/r+GlkLktgghehfAEboZHMbB/Dze1no4I80="; }; nativeBuildInputs = [ From d10fb5c60415ec9cea28cfc1dbed26226d9cb4b7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Feb 2023 13:40:50 +0100 Subject: [PATCH 096/116] python310Packages.sensorpro-ble: 0.5.1 -> 0.5.3 Diff: https://github.com/Bluetooth-Devices/sensorpro-ble/compare/v0.5.1...v0.5.3 Changelog: https://github.com/Bluetooth-Devices/sensorpro-ble/blob/v0.5.3/CHANGELOG.md --- pkgs/development/python-modules/sensorpro-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sensorpro-ble/default.nix b/pkgs/development/python-modules/sensorpro-ble/default.nix index 3e9793d0974e..df3be2b3fe4e 100644 --- a/pkgs/development/python-modules/sensorpro-ble/default.nix +++ b/pkgs/development/python-modules/sensorpro-ble/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "sensorpro-ble"; - version = "0.5.1"; + version = "0.5.3"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-D0xHNPsGlNBoHR3LqR6TbVhqXWapzwYsG+uN3kSF1oE="; + hash = "sha256-Zqa6qa0Jw79Iu4VEw6KN0GsZcC1X7OpiYUiyT4zwKyY="; }; nativeBuildInputs = [ From e968d033212ad82743a536189e84ea857762e7ae Mon Sep 17 00:00:00 2001 From: Atemu Date: Tue, 7 Feb 2023 12:53:37 +0100 Subject: [PATCH 097/116] ffmpeg_4: enable avresample again As noted in https://github.com/NixOS/nixpkgs/pull/211834#issuecomment-1417435991, removing the deprecated avresample causes some packages to break. Keep avresample in ffmpeg_4 only for now (it's removed in ffmpeg_5). --- pkgs/development/libraries/ffmpeg/generic.nix | 29 ++++++++++++++----- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 0acf45212e9d..dceada0f7f8f 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -140,6 +140,9 @@ , buildAvdevice ? withHeadlessDeps # Build avdevice library , buildAvfilter ? withHeadlessDeps # Build avfilter library , buildAvformat ? withHeadlessDeps # Build avformat library +# Deprecated but depended upon by some packages. +# https://github.com/NixOS/nixpkgs/pull/211834#issuecomment-1417435991) +, buildAvresample ? withHeadlessDeps && lib.versionOlder version "5" # Build avresample library , buildAvutil ? withHeadlessDeps # Build avutil library , buildPostproc ? withHeadlessDeps # Build postproc library , buildSwresample ? withHeadlessDeps # Build swresample library @@ -301,11 +304,11 @@ assert withPixelutils -> buildAvutil; assert buildFfmpeg -> buildAvcodec && buildAvfilter && buildAvformat - && buildSwresample; + && (buildSwresample || buildAvresample); assert buildFfplay -> buildAvcodec && buildAvformat && buildSwscale - && buildSwresample; + && (buildSwresample || buildAvresample); assert buildFfprobe -> buildAvcodec && buildAvformat; /* * Library dependencies @@ -392,6 +395,10 @@ stdenv.mkDerivation rec { (enableFeature buildAvdevice "avdevice") (enableFeature buildAvfilter "avfilter") (enableFeature buildAvformat "avformat") + ] ++ optionals (lib.versionOlder version "5") [ + # Ffmpeg > 4 doesn't know about the flag anymore + (enableFeature buildAvresample "avresample") + ] ++ [ (enableFeature buildAvutil "avutil") (enableFeature (buildPostproc && withGPL) "postproc") (enableFeature buildSwresample "swresample") @@ -611,14 +618,22 @@ stdenv.mkDerivation rec { doCheck = stdenv.hostPlatform == stdenv.buildPlatform; - # Fails with SIGABRT otherwise + # Fails with SIGABRT otherwise FIXME: Why? checkPhase = let ldLibraryPathEnv = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; + libsToLink = [ ] + ++ optional buildAvcodec "libavcodec" + ++ optional buildAvdevice "libavdevice" + ++ optional buildAvfilter "libavfilter" + ++ optional buildAvformat "libavformat" + ++ optional buildAvresample "libavresample" + ++ optional buildAvutil "libavutil" + ++ optional buildPostproc "libpostproc" + ++ optional buildSwresample "libswresample" + ++ optional buildSwscale "libswscale" + ; in '' - ${ldLibraryPathEnv}="libavcodec:libavdevice:libavfilter:libavformat:libavutil:libpostproc${ - optionalString (withHeadlessDeps) ":libswresample" # TODO this can probably go away - }:libswscale:''${${ldLibraryPathEnv}}" \ - make check -j$NIX_BUILD_CORES + ${ldLibraryPathEnv}="${lib.concatStringsSep ":" libsToLink}" make check -j$NIX_BUILD_CORES ''; outputs = optionals withBin [ "bin" ] # The first output is the one that gets symlinked by default! From ec0275c684ac706725102dd1082bbccb6c52db4b Mon Sep 17 00:00:00 2001 From: Atemu Date: Tue, 7 Feb 2023 13:48:30 +0100 Subject: [PATCH 098/116] ffmpeg-full: remove dead file Should have been removed in 4fc9f2e86b3fd1d6604cc2f65c7c18466d7c37cf --- .../libraries/ffmpeg-full/default.nix | 511 ------------------ 1 file changed, 511 deletions(-) delete mode 100644 pkgs/development/libraries/ffmpeg-full/default.nix diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix deleted file mode 100644 index a8acf7a7ce61..000000000000 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ /dev/null @@ -1,511 +0,0 @@ -{ lib, stdenv, buildPackages, ffmpeg, addOpenGLRunpath, pkg-config, perl, texinfo, yasm -/* - * Licensing options (yes some are listed twice, filters and such are not listed) - */ -, gplLicensing ? true # GPL: fdkaac,openssl,frei0r,cdio,samba,utvideo,vidstab,x265,x265,xavs,avid,zvbi,x11grab -, version3Licensing ? true # (L)GPL3: libvmaf,opencore-amrnb,opencore-amrwb,samba,vo-aacenc,vo-amrwbenc -, nonfreeLicensing ? false # NONFREE: openssl,fdkaac,blackmagic-design-desktop-video -/* - * Build options - */ -, smallBuild ? false # Optimize for size instead of speed -, runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime (disable to compile natively) -, grayBuild ? true # Full grayscale support -, swscaleAlphaBuild ? true # Alpha channel support in swscale -, hardcodedTablesBuild ? true # Hardcode decode tables instead of runtime generation -, safeBitstreamReaderBuild ? true # Buffer boundary checking in bitreaders -, multithreadBuild ? true # Multithreading via pthreads/win32 threads -, networkBuild ? true # Network support -, pixelutilsBuild ? true # Pixel utils in libavutil -, enableLto ? false # build with link-time optimization -/* - * Program options - */ -, ffmpegProgram ? true # Build ffmpeg executable -, ffplayProgram ? true # Build ffplay executable -, ffprobeProgram ? true # Build ffprobe executable -, qtFaststartProgram ? true # Build qt-faststart executable -/* - * Library options - */ -, avcodecLibrary ? true # Build avcodec library -, avdeviceLibrary ? true # Build avdevice library -, avfilterLibrary ? true # Build avfilter library -, avformatLibrary ? true # Build avformat library -, avutilLibrary ? true # Build avutil library -, postprocLibrary ? true # Build postproc library -, swresampleLibrary ? true # Build swresample library -, swscaleLibrary ? true # Build swscale library -/* - * Documentation options - */ -, htmlpagesDocumentation ? false # HTML documentation pages -, manpagesDocumentation ? true # Man documentation pages -, podpagesDocumentation ? false # POD documentation pages -, txtpagesDocumentation ? false # Text documentation pages -/* - * External libraries options - */ -, alsa-lib ? null # Alsa in/output support -#, avisynth ? null # Support for reading AviSynth scripts -, bzip2 ? null -, clang ? null -, celt ? null # CELT decoder -#, crystalhd ? null # Broadcom CrystalHD hardware acceleration -, cuda ? !stdenv.isDarwin && !stdenv.isAarch64 # Dynamically linked CUDA -, cuda-llvm ? !stdenv.isDarwin && !stdenv.isAarch64 # LLVM-based CUDA compilation -, dav1d ? null # AV1 decoder (focused on speed and correctness) -#, decklinkExtlib ? false, blackmagic-design-desktop-video ? null # Blackmagic Design DeckLink I/O support -, fdkaacExtlib ? false, fdk_aac ? null # Fraunhofer FDK AAC de/encoder -#, flite ? null # Flite (voice synthesis) support -, fontconfig ? null # Needed for drawtext filter -, freetype ? null # Needed for drawtext filter -, frei0r ? null # frei0r video filtering -, fribidi ? null # Needed for drawtext filter -, game-music-emu ? null # Game Music Emulator -, gnutls ? null -, gsm ? null # GSM de/encoder -#, ilbc ? null # iLBC de/encoder -, libjack2 ? null # Jack audio (only version 2 is supported in this build) -, ladspaH ? null # LADSPA audio filtering -, lame ? null # LAME MP3 encoder -, libass ? null # (Advanced) SubStation Alpha subtitle rendering -, libaom ? null # AV1 encoder -, libbluray ? null # BluRay reading -, libbs2b ? null # bs2b DSP library -, libcaca ? null # Textual display (ASCII art) -#, libcdio-paranoia ? null # Audio CD grabbing -, libdc1394 ? null, libraw1394 ? null # IIDC-1394 grabbing (ieee 1394) -, libdrm ? null # libdrm support -, libiconv ? null -#, libiec61883 ? null, libavc1394 ? null # iec61883 (also uses libraw1394) -, libmfx ? null # Hardware acceleration vis libmfx -, libmodplug ? null # ModPlug support -, libmysofa ? null # HRTF support via SOFAlizer -#, libnut ? null # NUT (de)muxer, native (de)muser exists -, libogg ? null # Ogg container used by vorbis & theora -, libopenmpt ? null # Tracked music files decoder -, libopus ? null # Opus de/encoder -, librsvg ? null # SVG protocol -, libssh ? null # SFTP protocol -, libtheora ? null # Theora encoder -, libv4l ? null # Video 4 Linux support -, libva ? null # Vaapi hardware acceleration -, libvdpau ? null # Vdpau hardware acceleration -, libvmaf ? null # Netflix's VMAF (Video Multi-Method Assessment Fusion) -, libvorbis ? null # Vorbis de/encoding, native encoder exists -, libvpx ? null # VP8 & VP9 de/encoding -, libwebp ? null # WebP encoder -, libX11 ? null # Xlib support -, libxcb ? null # X11 grabbing using XCB -, libxcbshmExtlib ? true # X11 grabbing shm communication -, libxcbxfixesExtlib ? true # X11 grabbing mouse rendering -, libxcbshapeExtlib ? true # X11 grabbing shape rendering -, libXv ? null # Xlib support -, libXext ? null # Xlib support -, libxml2 ? null # libxml2 support, for IMF and DASH demuxers -, xz ? null # xz-utils -, nv-codec-headers ? null -, nvdec ? !stdenv.isDarwin && !stdenv.isAarch64 # NVIDIA NVDEC support -, nvenc ? !stdenv.isDarwin && !stdenv.isAarch64 # NVIDIA NVENC support -, openal ? null # OpenAL 1.1 capture support -, ocl-icd ? null # OpenCL ICD -, opencl-headers ? null # OpenCL headers -, opencore-amr ? null # AMR-NB de/encoder & AMR-WB decoder -#, opencv ? null # Video filtering -, openglExtlib ? false, libGL ? null, libGLU ? null # OpenGL rendering -, openh264 ? null # H.264/AVC encoder -, openjpeg ? null # JPEG 2000 de/encoder -, opensslExtlib ? false, openssl ? null -, libpulseaudio ? null # Pulseaudio input support -, rav1e ? null # AV1 encoder (focused on speed and safety) -, svt-av1 ? null # AV1 encoder/decoder (focused on speed and correctness) -, rtmpdump ? null # RTMP[E] support -#, libquvi ? null # Quvi input support -, samba ? null # Samba protocol -#, schroedinger ? null # Dirac de/encoder -, SDL2 ? null -#, shine ? null # Fixed-point MP3 encoder -, soxr ? null # Resampling via soxr -, speex ? null # Speex de/encoder -, srt ? null # Secure Reliable Transport (SRT) protocol -#, twolame ? null # MP2 encoder -#, utvideo ? null # Ut Video de/encoder -, vid-stab ? null # Video stabilization -#, vo-aacenc ? null # AAC encoder -, vo-amrwbenc ? null # AMR-WB encoder -, x264 ? null # H.264/AVC encoder -, x265 ? null # H.265/HEVC encoder -, xavs ? null # AVS encoder -, xvidcore ? null # Xvid encoder, native encoder exists -, zeromq4 ? null # Message passing -, zimg ? null -, zlib ? null -, vulkan-loader ? null -, glslang ? null -#, zvbi ? null # Teletext support -/* - * Developer options - */ -, debugDeveloper ? false -, optimizationsDeveloper ? true -, extraWarningsDeveloper ? false -, strippingDeveloper ? false -/* - * Darwin frameworks - */ -, Cocoa, CoreAudio, CoreServices, AVFoundation, MediaToolbox -, VideoDecodeAcceleration, VideoToolbox -}: - -/* Maintainer notes: - * - * Version bumps: - * It should always be safe to bump patch releases (e.g. 2.1.x, x being a patch release) - * If adding a new branch, note any configure flags that were added, changed, or deprecated/removed - * and make the necessary changes. - * - * Packages with errors: - * flite ilbc schroedinger - * opencv - circular dependency issue - * - * Not packaged: - * aacplus avisynth cdio-paranoia crystalhd libavc1394 libiec61883 - * libnut libquvi nvenc oss shine twolame - * utvideo vo-aacenc vo-amrwbenc xvmc zvbi blackmagic-design-desktop-video - * - * Need fixes to support Darwin: - * gsm libjack2 libmodplug libmfx(intel-media-sdk) nvenc pulseaudio samba - * vid-stab - * - * Need fixes to support AArch64: - * libmfx(intel-media-sdk) nvenc - * - * Not supported: - * stagefright-h264(android only) - * - * Known issues: - * flite: configure fails to find library - * Tried modifying ffmpeg's configure script and flite to use pkg-config - * Cross-compiling will disable features not present on host OS - * (e.g. dxva2 support [DirectX] will not be enabled unless natively compiled on Cygwin) - * - */ - -let - inherit (stdenv) isCygwin isDarwin isFreeBSD isLinux isAarch64; - inherit (lib) optional optionals optionalString enableFeature; -in - -/* - * Licensing dependencies - */ -assert version3Licensing -> gplLicensing; -assert nonfreeLicensing -> gplLicensing && version3Licensing; -/* - * Build dependencies - */ -assert networkBuild -> gnutls != null || opensslExtlib; -assert pixelutilsBuild -> avutilLibrary; -/* - * Platform dependencies - */ -assert isDarwin -> !nvenc; -/* - * Program dependencies - */ -assert ffmpegProgram -> avcodecLibrary - && avfilterLibrary - && avformatLibrary - && swresampleLibrary; -assert ffplayProgram -> avcodecLibrary - && avformatLibrary - && swscaleLibrary - && swresampleLibrary - && SDL2 != null; -assert ffprobeProgram -> avcodecLibrary && avformatLibrary; -/* - * Library dependencies - */ -assert avcodecLibrary -> avutilLibrary; # configure flag since 0.6 -assert avdeviceLibrary -> avformatLibrary - && avcodecLibrary - && avutilLibrary; # configure flag since 0.6 -assert avformatLibrary -> avcodecLibrary && avutilLibrary; # configure flag since 0.6 -assert postprocLibrary -> avutilLibrary; -assert swresampleLibrary -> soxr != null; -assert swscaleLibrary -> avutilLibrary; -/* - * External libraries - */ -#assert decklinkExtlib -> blackmagic-design-desktop-video != null -# && !isCygwin && multithreadBuild # POSIX threads required -# && nonfreeLicensing; -assert fdkaacExtlib -> fdk_aac != null && nonfreeLicensing; -assert gnutls != null -> !opensslExtlib; -assert libxcbshmExtlib -> libxcb != null; -assert libxcbxfixesExtlib -> libxcb != null; -assert libxcbshapeExtlib -> libxcb != null; -assert openglExtlib -> libGL != null && libGLU != null; -assert opensslExtlib -> gnutls == null && openssl != null && nonfreeLicensing; - -stdenv.mkDerivation rec { - pname = "ffmpeg-full"; - inherit (ffmpeg) src version patches; - - prePatch = '' - patchShebangs . - '' + lib.optionalString stdenv.isDarwin '' - sed -i 's/#ifndef __MAC_10_11/#if 1/' ./libavcodec/audiotoolboxdec.c - '' + lib.optionalString (frei0r != null) '' - substituteInPlace libavfilter/vf_frei0r.c \ - --replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1 - substituteInPlace doc/filters.texi \ - --replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1 - ''; - - configurePlatforms = []; - configureFlags = [ - "--target_os=${if stdenv.hostPlatform.isMinGW then "mingw64" else stdenv.hostPlatform.parsed.kernel.name}" #mingw32 and mingw64 doesn't have a difference here, it is internally rewritten as mingw32 - "--arch=${stdenv.hostPlatform.parsed.cpu.name}" - /* - * Licensing flags - */ - (enableFeature gplLicensing "gpl") - (enableFeature version3Licensing "version3") - (enableFeature nonfreeLicensing "nonfree") - /* - * Build flags - */ - # On some ARM platforms --enable-thumb - "--enable-shared" - (enableFeature true "pic") - (enableFeature smallBuild "small") - (enableFeature runtimeCpuDetectBuild "runtime-cpudetect") - (enableFeature enableLto "lto") - (enableFeature grayBuild "gray") - (enableFeature swscaleAlphaBuild "swscale-alpha") - (enableFeature hardcodedTablesBuild "hardcoded-tables") - (enableFeature safeBitstreamReaderBuild "safe-bitstream-reader") - (if multithreadBuild then ( - if stdenv.hostPlatform.isWindows then - "--disable-pthreads --enable-w32threads" - else # Use POSIX threads by default - "--enable-pthreads --disable-w32threads") - else - "--disable-pthreads --disable-w32threads") - "--disable-os2threads" # We don't support OS/2 - (enableFeature networkBuild "network") - (enableFeature pixelutilsBuild "pixelutils") - /* - * Program flags - */ - (enableFeature ffmpegProgram "ffmpeg") - (enableFeature ffplayProgram "ffplay") - (enableFeature ffprobeProgram "ffprobe") - /* - * Library flags - */ - (enableFeature avcodecLibrary "avcodec") - (enableFeature avdeviceLibrary "avdevice") - (enableFeature avfilterLibrary "avfilter") - (enableFeature avformatLibrary "avformat") - (enableFeature avutilLibrary "avutil") - (enableFeature (postprocLibrary && gplLicensing) "postproc") - (enableFeature swresampleLibrary "swresample") - (enableFeature swscaleLibrary "swscale") - /* - * Documentation flags - */ - (enableFeature (htmlpagesDocumentation - || manpagesDocumentation - || podpagesDocumentation - || txtpagesDocumentation) "doc") - (enableFeature htmlpagesDocumentation "htmlpages") - (enableFeature manpagesDocumentation "manpages") - (enableFeature podpagesDocumentation "podpages") - (enableFeature txtpagesDocumentation "txtpages") - /* - * External libraries - */ - #(enableFeature avisynth "avisynth") - (enableFeature (bzip2 != null) "bzlib") - (enableFeature (celt != null) "libcelt") - (enableFeature cuda "cuda") - (enableFeature (clang != null && cuda-llvm) "cuda-llvm") - #(enableFeature crystalhd "crystalhd") - (enableFeature (dav1d != null) "libdav1d") - #(enableFeature decklinkExtlib "decklink") - (enableFeature (fdkaacExtlib && gplLicensing) "libfdk-aac") - #(enableFeature (flite != null) "libflite") - "--disable-libflite" # Force disable until a solution is found - (enableFeature (fontconfig != null) "fontconfig") - (enableFeature (freetype != null) "libfreetype") - (enableFeature (frei0r != null && gplLicensing) "frei0r") - (enableFeature (fribidi != null) "libfribidi") - (enableFeature (game-music-emu != null) "libgme") - (enableFeature (gnutls != null) "gnutls") - (enableFeature (gsm != null) "libgsm") - #(enableFeature (ilbc != null) "libilbc") - (enableFeature (ladspaH !=null) "ladspa") - (enableFeature (lame != null) "libmp3lame") - (enableFeature (libaom != null) "libaom") - (enableFeature (libass != null) "libass") - #(enableFeature (libavc1394 != null) null null) - (enableFeature (libbluray != null) "libbluray") - (enableFeature (libbs2b != null) "libbs2b") - #(enableFeature (libcaca != null) "libcaca") - #(enableFeature (cdio-paranoia != null && gplLicensing) "libcdio") - (enableFeature (if isLinux then libdc1394 != null && libraw1394 != null else false) "libdc1394") - (enableFeature ((isLinux || isFreeBSD) && libdrm != null) "libdrm") - (enableFeature (libiconv != null) "iconv") - (enableFeature (libjack2 != null) "libjack") - #(enableFeature (if isLinux then libiec61883 != null && libavc1394 != null && libraw1394 != null else false) "libiec61883") - (enableFeature (if isLinux && !isAarch64 then libmfx != null else false) "libmfx") - (enableFeature (libmodplug != null) "libmodplug") - (enableFeature (libmysofa != null) "libmysofa") - #(enableFeature (libnut != null) "libnut") - (enableFeature (libopenmpt != null) "libopenmpt") - (enableFeature (libopus != null) "libopus") - (enableFeature (librsvg != null) "librsvg") - (enableFeature (srt != null) "libsrt") - (enableFeature (libssh != null) "libssh") - (enableFeature (libtheora != null) "libtheora") - (enableFeature (if isLinux then libv4l != null else false) "libv4l2") - (enableFeature ((isLinux || isFreeBSD) && libva != null) "vaapi") - (enableFeature (libvdpau != null) "vdpau") - (enableFeature (libvorbis != null) "libvorbis") - (enableFeature (!isAarch64 && libvmaf != null && version3Licensing) "libvmaf") - (enableFeature (libvpx != null) "libvpx") - (enableFeature (libwebp != null) "libwebp") - (enableFeature (libX11 != null && libXv != null && libXext != null) "xlib") - (enableFeature (libxcb != null) "libxcb") - (enableFeature libxcbshmExtlib "libxcb-shm") - (enableFeature libxcbxfixesExtlib "libxcb-xfixes") - (enableFeature libxcbshapeExtlib "libxcb-shape") - (enableFeature (libxml2 != null) "libxml2") - (enableFeature (xz != null) "lzma") - (enableFeature nvdec "cuvid") - (enableFeature nvdec "nvdec") - (enableFeature nvenc "nvenc") - (enableFeature (openal != null) "openal") - (enableFeature (ocl-icd != null && opencl-headers != null) "opencl") - (enableFeature (opencore-amr != null && version3Licensing) "libopencore-amrnb") - #(enableFeature (opencv != null) "libopencv") - (enableFeature openglExtlib "opengl") - (enableFeature (openh264 != null) "libopenh264") - (enableFeature (openjpeg != null) "libopenjpeg") - (enableFeature (opensslExtlib && gplLicensing) "openssl") - (enableFeature (libpulseaudio != null) "libpulse") - #(enableFeature quvi "libquvi") - (enableFeature (rav1e != null) "librav1e") - (enableFeature (svt-av1 != null) "libsvtav1") - (enableFeature (rtmpdump != null) "librtmp") - #(enableFeature (schroedinger != null) "libschroedinger") - (enableFeature (SDL2 != null) "sdl2") - (enableFeature (soxr != null) "libsoxr") - (enableFeature (speex != null) "libspeex") - #(enableFeature (twolame != null) "libtwolame") - #(enableFeature (utvideo != null && gplLicensing) "libutvideo") - (enableFeature (vid-stab != null && gplLicensing) "libvidstab") # Actual min. version 2.0 - #(enableFeature (vo-aacenc != null && version3Licensing) "libvo-aacenc") - (enableFeature (vo-amrwbenc != null && version3Licensing) "libvo-amrwbenc") - (enableFeature (x264 != null && gplLicensing) "libx264") - (enableFeature (x265 != null && gplLicensing) "libx265") - (enableFeature (xavs != null && gplLicensing) "libxavs") - (enableFeature (xvidcore != null && gplLicensing) "libxvid") - (enableFeature (zeromq4 != null) "libzmq") - (enableFeature (zimg != null) "libzimg") - (enableFeature (zlib != null) "zlib") - (enableFeature (isLinux && vulkan-loader != null) "vulkan") - (enableFeature (isLinux && vulkan-loader != null && glslang != null) "libglslang") - (enableFeature (samba != null && gplLicensing && version3Licensing) "libsmbclient") - #(enableFeature (zvbi != null && gplLicensing) "libzvbi") - /* - * Developer flags - */ - (enableFeature debugDeveloper "debug") - (enableFeature optimizationsDeveloper "optimizations") - (enableFeature extraWarningsDeveloper "extra-warnings") - (enableFeature strippingDeveloper "stripping") - ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "--cross-prefix=${stdenv.cc.targetPrefix}" - "--enable-cross-compile" - "--host-cc=${buildPackages.stdenv.cc}/bin/cc" - ] ++ optionals stdenv.cc.isClang [ - "--cc=clang" - "--cxx=clang++" - ]; - - nativeBuildInputs = [ addOpenGLRunpath perl pkg-config texinfo yasm ]; - - buildInputs = [ - bzip2 celt dav1d fontconfig freetype frei0r fribidi game-music-emu gnutls gsm - libjack2 ladspaH lame libaom libass libbluray libbs2b libcaca libdc1394 libmodplug libmysofa - libogg libopenmpt libopus librsvg libssh libtheora libvdpau libvorbis libvpx libwebp libX11 - libxcb libXv libXext libxml2 xz openal ocl-icd opencl-headers openjpeg libpulseaudio rav1e svt-av1 rtmpdump opencore-amr - samba SDL2 soxr speex srt vid-stab vo-amrwbenc x264 x265 xavs xvidcore - zeromq4 zimg zlib openh264 - ] ++ optionals openglExtlib [ libGL libGLU ] - ++ optionals nonfreeLicensing [ fdk_aac openssl ] - ++ optional ((isLinux || isFreeBSD) && libva != null) libva - ++ optional ((isLinux || isFreeBSD) && libdrm != null) libdrm - ++ optional (!isAarch64 && libvmaf != null && version3Licensing) libvmaf - ++ optionals isLinux [ alsa-lib libraw1394 libv4l vulkan-loader glslang ] - ++ optional (isLinux && !isAarch64 && libmfx != null) libmfx - ++ optional (nvdec || nvenc) nv-codec-headers - ++ optional cuda-llvm clang - ++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation - MediaToolbox VideoDecodeAcceleration VideoToolbox - libiconv ]; - - buildFlags = [ "all" ] - ++ optional qtFaststartProgram "tools/qt-faststart"; # Build qt-faststart executable - - doCheck = true; - checkPhase = let - ldLibraryPathEnv = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; - in '' - ${ldLibraryPathEnv}="libavcodec:libavdevice:libavfilter:libavformat:libavutil:libpostproc:libswresample:libswscale:''${${ldLibraryPathEnv}}" \ - make check -j$NIX_BUILD_CORES - ''; - - # Hacky framework patching technique borrowed from the phantomjs2 package - postInstall = optionalString qtFaststartProgram '' - cp -a tools/qt-faststart $out/bin/ - ''; - - postFixup = optionalString stdenv.isLinux '' - # Set RUNPATH so that libnvcuvid and libcuda in /run/opengl-driver(-32)/lib can be found. - # See the explanation in addOpenGLRunpath. - addOpenGLRunpath $out/lib/libavcodec.so - addOpenGLRunpath $out/lib/libavutil.so - ''; - - enableParallelBuilding = true; - - meta = with lib; { - description = "A complete, cross-platform solution to record, convert and stream audio and video"; - homepage = "https://www.ffmpeg.org/"; - changelog = "https://github.com/FFmpeg/FFmpeg/blob/n${version}/Changelog"; - longDescription = '' - FFmpeg is the leading multimedia framework, able to decode, encode, transcode, - mux, demux, stream, filter and play pretty much anything that humans and machines - have created. It supports the most obscure ancient formats up to the cutting edge. - No matter if they were designed by some standards committee, the community or - a corporation. - ''; - license = ( - if nonfreeLicensing then - licenses.unfreeRedistributable - else if version3Licensing then - licenses.gpl3 - else if gplLicensing then - licenses.gpl2Plus - else - licenses.lgpl21Plus - ); - platforms = platforms.all; - maintainers = with maintainers; [ codyopel ]; - }; -} From a58df10aa82311588fa570e3727cc487d9731083 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Feb 2023 13:51:13 +0100 Subject: [PATCH 099/116] python310Packages.sensorpush-ble: add changelog to meta --- pkgs/development/python-modules/sensorpush-ble/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/sensorpush-ble/default.nix b/pkgs/development/python-modules/sensorpush-ble/default.nix index 821ba9577cb1..d51f6d7d6447 100644 --- a/pkgs/development/python-modules/sensorpush-ble/default.nix +++ b/pkgs/development/python-modules/sensorpush-ble/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Bluetooth-Devices"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-17Yzpbcy/r+GlkLktgghehfAEboZHMbB/Dze1no4I80="; }; @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for SensorPush BLE devices"; homepage = "https://github.com/Bluetooth-Devices/sensorpush-ble"; + changelog = "https://github.com/Bluetooth-Devices/sensorpush-ble/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From f903066b4ea7dedde544f6674a8135f96a777558 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Feb 2023 13:52:50 +0100 Subject: [PATCH 100/116] python310Packages.tilt-ble: add changelog to meta --- pkgs/development/python-modules/tilt-ble/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/tilt-ble/default.nix b/pkgs/development/python-modules/tilt-ble/default.nix index 4b9f751f2d60..1be167f9a88a 100644 --- a/pkgs/development/python-modules/tilt-ble/default.nix +++ b/pkgs/development/python-modules/tilt-ble/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Bluetooth-Devices"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-ok9XWx47hcke535480NORfS1pSagaOJvMR48lYTa/Tg="; }; @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for Tilt BLE devices"; homepage = "https://github.com/Bluetooth-Devices/tilt-ble"; + changelog = "https://github.com/Bluetooth-Devices/tilt-ble/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From 5a5decd2eb9a32276e7f5e0f8f0aff5bb69c6d36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Tue, 7 Feb 2023 13:58:34 +0100 Subject: [PATCH 101/116] doc: use `gitignoreSource` Running `make -C doc` to build the manual locally leaves .xml artifacts in the tree. These are ignored by git, but they still get included in the build when not using flakes, which causes the corresponding chapters not to be built. --- doc/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/default.nix b/doc/default.nix index 1d5fa4811a36..ac405c379038 100644 --- a/doc/default.nix +++ b/doc/default.nix @@ -1,6 +1,5 @@ { pkgs ? (import ./.. { }), nixpkgs ? { }}: let - lib = pkgs.lib; doc-support = import ./doc-support { inherit pkgs nixpkgs; }; in pkgs.stdenv.mkDerivation { name = "nixpkgs-manual"; @@ -15,7 +14,7 @@ in pkgs.stdenv.mkDerivation { xmlformat ]; - src = lib.cleanSource ./.; + src = pkgs.nix-gitignore.gitignoreSource [] ./.; postPatch = '' ln -s ${doc-support} ./doc-support/result From 821a5fa357f751e25e0fa75b8b90688fec067224 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 7 Feb 2023 14:07:40 +0100 Subject: [PATCH 102/116] privacyidea: 3.8 -> 3.8.1 ChangeLog: https://github.com/privacyidea/privacyidea/blob/v3.8.1/Changelog --- pkgs/applications/misc/privacyidea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/privacyidea/default.nix b/pkgs/applications/misc/privacyidea/default.nix index b83fd511b5d8..2af5e9d692db 100644 --- a/pkgs/applications/misc/privacyidea/default.nix +++ b/pkgs/applications/misc/privacyidea/default.nix @@ -159,13 +159,13 @@ let in python3'.pkgs.buildPythonPackage rec { pname = "privacyIDEA"; - version = "3.8"; + version = "3.8.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-FCvuWXon8c9LnX1FnCxcSTfBR5/6zijD6ld0iAEVFkU="; + sha256 = "sha256-SYXw8PBCb514v3rcy15W/vZS5JyMsu81D2sJmviLRtw="; fetchSubmodules = true; }; From 7ce6fb77e88b6c8371f431faa40d91f7a60eff65 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Feb 2023 13:12:19 +0000 Subject: [PATCH 103/116] zimfw: 1.11.0 -> 1.11.1 --- pkgs/shells/zsh/zimfw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/zsh/zimfw/default.nix b/pkgs/shells/zsh/zimfw/default.nix index f78723ee6e2b..02f1f6513c56 100644 --- a/pkgs/shells/zsh/zimfw/default.nix +++ b/pkgs/shells/zsh/zimfw/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "zimfw"; - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitHub { owner = "zimfw"; repo = "zimfw"; rev = "v${version}"; ## zim only needs this one file to be installed. sparseCheckout = [ "zimfw.zsh" ]; - sha256 = "sha256-BmzYAgP5Z77VqcpAB49cQLNuvQX1qcKmAh9BuXsy2pA="; + sha256 = "sha256-ZL/x5FNklRa5JnZ5UUofnIcW4dCInaEvTLBQfMJDWIM="; }; strictDeps = true; dontConfigure = true; From ecdd2b2310b345154a810f6c4e34fd5aebc7ef0c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Feb 2023 13:29:43 +0000 Subject: [PATCH 104/116] codeowners: 1.1.1 -> 1.1.2 --- pkgs/development/tools/codeowners/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/codeowners/default.nix b/pkgs/development/tools/codeowners/default.nix index 2b17f00863b0..186b8b4fdb73 100644 --- a/pkgs/development/tools/codeowners/default.nix +++ b/pkgs/development/tools/codeowners/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "codeowners"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "hmarr"; repo = pname; rev = "v${version}"; - hash = "sha256-lklKZCDX/e3MZ0ix3A4AIEICPoufBq7SAIULqDXOYDI="; + hash = "sha256-bjSlt439Y5hmbxR6s4J37ao+P2tuKNuwqRg872P+MUg="; }; - vendorSha256 = "sha256-G+oaX3SXsHJu3lq6n8dLmoRXDAYcFkrYarwePB/MdEU="; + vendorHash = "sha256-G+oaX3SXsHJu3lq6n8dLmoRXDAYcFkrYarwePB/MdEU="; meta = with lib; { description = "A CLI and Go library for Github's CODEOWNERS file"; From 7a3daed2bd5670a24d21afb070305edf9231af50 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Feb 2023 13:30:37 +0000 Subject: [PATCH 105/116] vtm: 0.9.8q -> 0.9.8r --- pkgs/tools/misc/vtm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/vtm/default.nix b/pkgs/tools/misc/vtm/default.nix index 93b451bedc8f..5b6e6efff367 100644 --- a/pkgs/tools/misc/vtm/default.nix +++ b/pkgs/tools/misc/vtm/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "vtm"; - version = "0.9.8q"; + version = "0.9.8r"; src = fetchFromGitHub { owner = "netxs-group"; repo = "vtm"; rev = "v${version}"; - sha256 = "sha256-oY0zmyAgxMHPcBxFNdByQfeLIquw6eQ2SSfCgTKtO7Q="; + sha256 = "sha256-1nCO8wtARnRCanIEH1XAJBjEnW18Bhm+pcr/EeiRrzY="; }; nativeBuildInputs = [ cmake ]; From fa2feee9d4c7fe9730c48638f2e53f6b7b7b1261 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Tue, 7 Feb 2023 08:32:54 -0500 Subject: [PATCH 106/116] kitty: 0.27.0 -> 0.27.1 --- pkgs/applications/terminal-emulators/kitty/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index 9725e8a4f96b..07980f8375aa 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -28,16 +28,16 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.27.0"; + version = "0.27.1"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "refs/tags/v${version}"; - hash = "sha256-742RB5ijCEYgjGgGyb6ZZ34GfMHm8253d3cNLQQzL38="; + hash = "sha256-/K/5T15kULTQP1FCLnyrKfhlQjIStayutaxLjmHjHes="; }; - vendorHash = "sha256-0hylttMwkmhpydKY7cpOoHrKmaGF4ediI8uwtcT3x4I="; + vendorHash = "sha256-JLPPNOsoq+ErLhELsX3z3YehYfgp7OGXEXlP3IVcM5k="; buildInputs = [ harfbuzz diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 170a9195d1f1..7304b66f3ac7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2452,6 +2452,7 @@ with pkgs; kermit-terminal = callPackage ../applications/terminal-emulators/kermit-terminal { }; kitty = darwin.apple_sdk_11_0.callPackage ../applications/terminal-emulators/kitty { + go = go_1_20; harfbuzz = harfbuzz.override { withCoreText = stdenv.isDarwin; }; inherit (darwin.apple_sdk_11_0) Libsystem; inherit (darwin.apple_sdk_11_0.frameworks) From b9a500adce7d21a78d3b463534bba3daf7f25548 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Feb 2023 14:11:59 +0000 Subject: [PATCH 107/116] python310Packages.goodwe: 0.2.23 -> 0.2.24 --- pkgs/development/python-modules/goodwe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/goodwe/default.nix b/pkgs/development/python-modules/goodwe/default.nix index 31d7127519e4..6d3875d3789d 100644 --- a/pkgs/development/python-modules/goodwe/default.nix +++ b/pkgs/development/python-modules/goodwe/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "goodwe"; - version = "0.2.23"; + version = "0.2.24"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "marcelblijleven"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-SX49v+DuV4IZdTJc9XhqhgtG81qLC9QnR/LPMu2m0fo="; + sha256 = "sha256-dcz9IEPr5n86NHne9lEDB0kERY8o+jUEqPmz6QMEF4Q="; }; postPatch = '' From 7c23fd294ba1e76834b92954d46e77996dff7b08 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Tue, 7 Feb 2023 15:12:52 +0100 Subject: [PATCH 108/116] udp2raw: 20200818.0 -> 20230206.0 --- pkgs/tools/networking/udp2raw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/udp2raw/default.nix b/pkgs/tools/networking/udp2raw/default.nix index fdb95b121f2d..1bb063925236 100644 --- a/pkgs/tools/networking/udp2raw/default.nix +++ b/pkgs/tools/networking/udp2raw/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "udp2raw"; - version = "20200818.0"; + version = "20230206.0"; src = fetchFromGitHub { owner = "wangyu-"; repo = "udp2raw"; rev = version; - hash = "sha256-TkTOfF1RfHJzt80q0mN4Fek3XSFY/8jdeAVtyluZBt8="; + hash = "sha256-mchSaqw6sOJ7+dydCM8juP7QMOVUrPL4MFA79Rvyjdo="; }; nativeBuildInputs = [ makeWrapper ]; From 2a4cb50a3ff8ba724606ddd67155061d72b2c8f3 Mon Sep 17 00:00:00 2001 From: IndeedNotJames Date: Tue, 7 Feb 2023 15:58:25 +0100 Subject: [PATCH 109/116] xcaddy: 0.3.1 -> 0.3.2 --- pkgs/servers/caddy/xcaddy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/caddy/xcaddy/default.nix b/pkgs/servers/caddy/xcaddy/default.nix index 634a6aed1402..3c462e4b6576 100644 --- a/pkgs/servers/caddy/xcaddy/default.nix +++ b/pkgs/servers/caddy/xcaddy/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "xcaddy"; - version = "0.3.1"; + version = "0.3.2"; subPackages = [ "cmd/xcaddy" ]; @@ -10,7 +10,7 @@ buildGoModule rec { owner = "caddyserver"; repo = pname; rev = "v${version}"; - hash = "sha256-oGTtS5UlEebIqv4SM4q0YclASJNu8DNOLrGLRRAtkd8="; + hash = "sha256-M0eMI/TtUNVqE4F1ifizVb0e4ACGa+yLkG3pJLaaDNs="; }; patches = [ From ed903ee4efc5fcc1f77e7c24a1e03f7f75d24c35 Mon Sep 17 00:00:00 2001 From: IndeedNotJames Date: Tue, 7 Feb 2023 15:58:25 +0100 Subject: [PATCH 110/116] xcaddy: add indeednotjames as maintainer --- pkgs/servers/caddy/xcaddy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/caddy/xcaddy/default.nix b/pkgs/servers/caddy/xcaddy/default.nix index 3c462e4b6576..96552f0e32c6 100644 --- a/pkgs/servers/caddy/xcaddy/default.nix +++ b/pkgs/servers/caddy/xcaddy/default.nix @@ -23,6 +23,6 @@ buildGoModule rec { homepage = "https://github.com/caddyserver/xcaddy"; description = "Build Caddy with plugins"; license = licenses.asl20; - maintainers = with maintainers; [ tjni ]; + maintainers = with maintainers; [ tjni indeednotjames ]; }; } From 897bc4daabad84b73d7caa8ef2d0bd845d8c701e Mon Sep 17 00:00:00 2001 From: IndeedNotJames Date: Tue, 7 Feb 2023 15:58:25 +0100 Subject: [PATCH 111/116] xcaddy: fix build info --- pkgs/servers/caddy/xcaddy/default.nix | 7 +++++++ .../caddy/xcaddy/inject_version_info.diff | 16 ++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/servers/caddy/xcaddy/inject_version_info.diff diff --git a/pkgs/servers/caddy/xcaddy/default.nix b/pkgs/servers/caddy/xcaddy/default.nix index 96552f0e32c6..c20a0e325ec9 100644 --- a/pkgs/servers/caddy/xcaddy/default.nix +++ b/pkgs/servers/caddy/xcaddy/default.nix @@ -14,9 +14,16 @@ buildGoModule rec { }; patches = [ + ./inject_version_info.diff ./use_tmpdir_on_darwin.diff ]; + ldflags = [ + "-s" + "-w" + "-X github.com/caddyserver/xcaddy/cmd.customVersion=v${version}" + ]; + vendorHash = "sha256-RpbnoXyTrqGOI7DpgkO+J47P17T4QCVvM1CfS6kRO9Y="; meta = with lib; { diff --git a/pkgs/servers/caddy/xcaddy/inject_version_info.diff b/pkgs/servers/caddy/xcaddy/inject_version_info.diff new file mode 100644 index 000000000000..4d87aa687878 --- /dev/null +++ b/pkgs/servers/caddy/xcaddy/inject_version_info.diff @@ -0,0 +1,16 @@ +diff --git a/cmd/main.go b/cmd/main.go +index ede7cd8..c553140 100644 +--- a/cmd/main.go ++++ b/cmd/main.go +@@ -401,8 +401,11 @@ func splitWith(arg string) (module, version, replace string, err error) { + return + } + ++var customVersion string ++ + // xcaddyVersion returns a detailed version string, if available. + func xcaddyVersion() string { ++ return customVersion + mod := goModule() + ver := mod.Version + if mod.Sum != "" { From 7cf89a39e14038669aa328de37f94dc6242d17ce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Feb 2023 15:28:23 +0000 Subject: [PATCH 112/116] python310Packages.schwifty: 2022.9.0 -> 2023.2.0 --- pkgs/development/python-modules/schwifty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/schwifty/default.nix b/pkgs/development/python-modules/schwifty/default.nix index 93dc48affc82..38fffa4ba88f 100644 --- a/pkgs/development/python-modules/schwifty/default.nix +++ b/pkgs/development/python-modules/schwifty/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "schwifty"; - version = "2022.9.0"; + version = "2023.2.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/zxK0pUfg5G5w9E+QBt1H12Ld5gWc+WakQdNVRMSFiA="; + sha256 = "sha256-YEBBrU+Xcl5zFPEt/EvPD5eFPUYSpGJ3ZoIK6PRVwlc="; }; propagatedBuildInputs = [ From 6bfd49ed80adb85e377aa26e1f13c94d25575b1f Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 3 Feb 2023 17:16:10 +0100 Subject: [PATCH 113/116] Merge #214387: pipewire: fix pipewire-rs builds (cherry picked from commit 1099adf48ba534db964b0db6705dd393e31e4b73) (bumping from staging to staging-next) --- pkgs/development/libraries/pipewire/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index c819e3f080b9..53d465542b2b 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -109,6 +109,13 @@ let url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/fba7083f8ceb210c7c20aceafeb5c9a8767cf705.patch"; hash = "sha256-aZQ4OzK0B5YPq+jQNygxPE0coG2qB0ukbYzyI8E24XM="; }) + + # backport a fix for rust-cbindgen errors in downstream packages + # See https://github.com/NixOS/nixpkgs/pull/211872#issuecomment-1415981135 for details. + (fetchpatch { + url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/caf58ecffb4dc8e2bfa7898d0ed910cf0a82d65f.patch"; + hash = "sha256-kCQNG0j3lwT01WNfGsdUmKvDHg8tvMfS2eunPyXBV1E="; + }) ]; strictDeps = true; From 15cf84feea87949eb01b9b6e631246fe6991cd3a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 7 Feb 2023 16:40:10 +0100 Subject: [PATCH 114/116] openssl: 3.0.7 -> 3.0.8 https://github.com/openssl/openssl/blob/openssl-3.0.8/NEWS.md Fixes: CVE-2023-0401, CVE-2023-0286, CVE-2023-0217, CVE-2023-0216, CVE-2023-0215, CVE-2022-4450, CVE-2022-4304, CVE-2022-4203, CVE-2022-3996 --- .../libraries/openssl/3.0/CVE-2022-3996.patch | 36 ------------------- .../development/libraries/openssl/default.nix | 7 ++-- 2 files changed, 2 insertions(+), 41 deletions(-) delete mode 100644 pkgs/development/libraries/openssl/3.0/CVE-2022-3996.patch diff --git a/pkgs/development/libraries/openssl/3.0/CVE-2022-3996.patch b/pkgs/development/libraries/openssl/3.0/CVE-2022-3996.patch deleted file mode 100644 index 2acedda0e3a4..000000000000 --- a/pkgs/development/libraries/openssl/3.0/CVE-2022-3996.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 7725e7bfe6f2ce8146b6552b44e0d226be7638e7 Mon Sep 17 00:00:00 2001 -From: Pauli -Date: Fri, 11 Nov 2022 09:40:19 +1100 -Subject: [PATCH] x509: fix double locking problem - -This reverts commit 9aa4be691f5c73eb3c68606d824c104550c053f7 and removed the -redundant flag setting. - -Fixes #19643 - -Fixes LOW CVE-2022-3996 - -Reviewed-by: Dmitry Belyavskiy -Reviewed-by: Tomas Mraz -(Merged from https://github.com/openssl/openssl/pull/19652) - -(cherry picked from commit 4d0340a6d2f327700a059f0b8f954d6160f8eef5) ---- - crypto/x509/pcy_map.c | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/crypto/x509/pcy_map.c b/crypto/x509/pcy_map.c -index 05406c6493fc..60dfd1e3203b 100644 ---- a/crypto/x509/pcy_map.c -+++ b/crypto/x509/pcy_map.c -@@ -73,10 +73,6 @@ int ossl_policy_cache_set_mapping(X509 *x, POLICY_MAPPINGS *maps) - - ret = 1; - bad_mapping: -- if (ret == -1 && CRYPTO_THREAD_write_lock(x->lock)) { -- x->ex_flags |= EXFLAG_INVALID_POLICY; -- CRYPTO_THREAD_unlock(x->lock); -- } - sk_POLICY_MAPPING_pop_free(maps, POLICY_MAPPING_free); - return ret; - diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 4c322997963a..df907f34ced4 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -229,8 +229,8 @@ in { }; openssl_3 = common { - version = "3.0.7"; - sha256 = "sha256-gwSdBComDmlvYkBqxcCL9wb9hDg/lFzyG9YentlcOW4="; + version = "3.0.8"; + sha256 = "sha256-bBPSvzj98x6sPOKjRwc2c/XWMmM5jx9p0N9KQSU+Sz4="; patches = [ ./3.0/nix-ssl-cert-file.patch @@ -241,9 +241,6 @@ in { (if stdenv.hostPlatform.isDarwin then ./use-etc-ssl-certs-darwin.patch else ./use-etc-ssl-certs.patch) - - # Remove with 3.0.8 release - ./3.0/CVE-2022-3996.patch ]; withDocs = true; From faa4d60e7fab7386ec9081364db8dbe92aca2fc4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 7 Feb 2023 16:42:00 +0100 Subject: [PATCH 115/116] openssl_1_1: 1.1.1s -> 1.1.1t https://github.com/openssl/openssl/blob/OpenSSL_1_1_1t/NEWS Fixes: CVE-2023-0286, CVE-2023-0215, CVE-2022-4450, CVE-2022-4304 --- pkgs/development/libraries/openssl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 4c322997963a..3485019b46ec 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -216,8 +216,8 @@ in { openssl_1_1 = common { - version = "1.1.1s"; - sha256 = "sha256-xawB52Dub/Dath1rK70wFGck0GPrMiGAxvGKb3Tktqo="; + version = "1.1.1t"; + sha256 = "sha256-je6bJL2x3L8MPR6bAvuPa/IhZegH9Fret8lndTaFnTs="; patches = [ ./1.1/nix-ssl-cert-file.patch From c5365dce85d3e8eb30b2713c67d52f74df332809 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 7 Feb 2023 16:35:28 +0000 Subject: [PATCH 116/116] eclipses.eclipse-sdk: fix hash for x86_64-linux When aarch64 support was added, the x86_64 appears to have been accidentally replaced with the one for eclipse-platform. Fixes: 2c3e53a6cdc ("eclipses.*: Enable on aarch64-linux") --- pkgs/applications/editors/eclipse/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index a57a3901f63a..a0b0fa56de15 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -103,7 +103,7 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha512-hmdWGteMDt4HhYq+k9twuftalpTzHtGnVVLphZcpJcw+6vJfersciDMaeLRqbCAeFbzJdgzjYo76bpP6FubySw=="; + x86_64 = "sha512-yH4/K9sBLCUc2EVYwPL0dLql/S3AfaV6fFh7ewAuIb7yHtcsOWMqy/h1hZUlFFg2ykfwDWDDHEK7qfTI0hM7BQ=="; aarch64 = "sha512-UYp8t7r2RrN3rKN180cWpJyhyO5LVXL8LrTRKJzttUgB7kM1nroTEI3DesBu+Hw4Ynl7eLiBK397rqcpOAfxJw=="; }.${arch}; };