From f68c35790ec749b72ad0607ab84cae11016fdd1e Mon Sep 17 00:00:00 2001 From: Maciek Starzyk Date: Sun, 20 Nov 2022 23:19:18 +0100 Subject: [PATCH 001/163] nodePackages.readability-cli: add missing build inputs for canvas module --- pkgs/development/node-packages/overrides.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index bb73049be66a..32d046d143af 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -444,6 +444,15 @@ final: prev: { ''; }; + readability-cli = prev.readability-cli.override (oldAttrs: { + nativeBuildInputs = [ pkgs.pkg-config ]; + buildInputs = with pkgs; [ + pixman + cairo + pango + ]; + }); + reveal-md = prev.reveal-md.override ( lib.optionalAttrs (!stdenv.isDarwin) { nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; From ee2571e8fe2222725e74547cd898654429ae7a22 Mon Sep 17 00:00:00 2001 From: Maciek Starzyk Date: Sun, 20 Nov 2022 23:25:21 +0100 Subject: [PATCH 002/163] nodePackages.readability-cli: do not patch a deno shebang line --- pkgs/development/node-packages/overrides.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index 32d046d143af..6b14a4612b1a 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -445,6 +445,18 @@ final: prev: { }; readability-cli = prev.readability-cli.override (oldAttrs: { + # Wrap src to fix this build error: + # > readability-cli/readable.ts: unsupported interpreter directive "#!/usr/bin/env -S deno..." + # + # Need to wrap the source, instead of patching in patchPhase, because + # buildNodePackage only unpacks sources in the installPhase. + src = stdenv.mkDerivation { + src = oldAttrs.src; + name = oldAttrs.name + "-src"; + patchPhase = "chmod a-x readable.ts"; + installPhase = ''cp -r . "$out"''; + }; + nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = with pkgs; [ pixman From dfac3e29cb489552a308dd422a84f65419d61736 Mon Sep 17 00:00:00 2001 From: Maciek Starzyk Date: Mon, 21 Nov 2022 09:44:20 +0100 Subject: [PATCH 003/163] nodePackages.readability-cli: use srcOnly (thanks to @marsam) --- pkgs/development/node-packages/overrides.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index 6b14a4612b1a..51648536ea58 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -450,11 +450,10 @@ final: prev: { # # Need to wrap the source, instead of patching in patchPhase, because # buildNodePackage only unpacks sources in the installPhase. - src = stdenv.mkDerivation { + src = pkgs.srcOnly { src = oldAttrs.src; - name = oldAttrs.name + "-src"; + name = oldAttrs.name; patchPhase = "chmod a-x readable.ts"; - installPhase = ''cp -r . "$out"''; }; nativeBuildInputs = [ pkgs.pkg-config ]; From 3a61d6d707752ebed77bf60e450176b00913cd74 Mon Sep 17 00:00:00 2001 From: Alex Rice Date: Thu, 1 Dec 2022 15:53:35 +0000 Subject: [PATCH 004/163] agdaPackages.cubical: 0.4prec3e097a -> 0.4 --- pkgs/development/libraries/agda/cubical/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/agda/cubical/default.nix b/pkgs/development/libraries/agda/cubical/default.nix index 4cbbf5305094..e4801fbda8e3 100644 --- a/pkgs/development/libraries/agda/cubical/default.nix +++ b/pkgs/development/libraries/agda/cubical/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "cubical"; - version = "0.4prec3e097a"; + version = "0.4"; src = fetchFromGitHub { repo = pname; owner = "agda"; - rev = "c3e097a98c84083550fa31101346bd42a0501add"; - sha256 = "101cni2a9xvia1mglb94z61jm8xk9r5kc1sn44cri0qsmk1zbqxs"; + rev = "v${version}"; + hash = "sha256-bnHz5uZXZnn1Zd36tq/veA4yT7dhJ1c+AYpgdDfSRzE="; }; LC_ALL = "en_US.UTF-8"; From 4b3656046b2d00fef857d731f871947377392dd0 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 26 Dec 2022 20:36:29 -0500 Subject: [PATCH 005/163] python3Packages.datatable: 0.11.0 -> unstable-2022-12-15 This fixes the packages for python 3.10+. --- .../python-modules/datatable/default.nix | 34 +++++++++---------- 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/datatable/default.nix b/pkgs/development/python-modules/datatable/default.nix index 2ebb488aba77..a2fb8aba71c8 100644 --- a/pkgs/development/python-modules/datatable/default.nix +++ b/pkgs/development/python-modules/datatable/default.nix @@ -1,25 +1,29 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, pythonOlder -, pipInstallHook, writeText +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +, pipInstallHook +, writeText , blessed , docutils , libcxx , llvm , pytestCheckHook , typesentry -, isPy310 }: buildPythonPackage rec { pname = "datatable"; - version = "0.11.0"; - disabled = pythonOlder "3.5"; + # python 3.10+ support is not in the 1.0.0 release + version = "unstable-2022-12-15"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "19c602711e00f72e9ae296d8fa742d46da037c2d3a2d254bdf68f817a8da76bb"; + src = fetchFromGitHub { + owner = "h2oai"; + repo = pname; + rev = "9522f0833d3e965656396de4fffebd882d39c25d"; + hash = "sha256-lEXQwhx2msnJkkRrTkAwYttlYTISyH/Z7dSalqRrOhI="; }; - # authors seem to have created their own build system - format = "other"; postPatch = '' # tarball doesn't appear to have been shipped totally ready-to-build @@ -27,17 +31,14 @@ buildPythonPackage rec { --replace \ 'shell_cmd(["git"' \ '"0000000000000000000000000000000000000000" or shell_cmd(["git"' - echo '${version}' > VERSION.txt + # TODO revert back to use ${version} when bumping to the next stable release + echo '1.0' > VERSION.txt # don't make assumptions about architecture sed -i '/-m64/d' ci/ext.py ''; DT_RELEASE = "1"; - buildPhase = '' - python ci/ext.py wheel - ''; - propagatedBuildInputs = [ typesentry blessed ]; buildInputs = [ llvm pipInstallHook ]; checkInputs = [ docutils pytestCheckHook ]; @@ -62,8 +63,5 @@ buildPythonPackage rec { homepage = "https://github.com/h2oai/datatable"; license = licenses.mpl20; maintainers = with maintainers; [ abbradar ]; - # uses custom build system and adds -Wunused-variable -Werror - # warning: ‘dt::expr::doc_first’ defined but not used [-Wunused-variable] - broken = isPy310; }; } From 97c990547782382d47a354affab0946270ce8660 Mon Sep 17 00:00:00 2001 From: Matt Melling Date: Thu, 8 Dec 2022 19:38:42 +0000 Subject: [PATCH 006/163] gridtracker: init at 1.22.1226 --- .../radio/gridtracker/default.nix | 43 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/applications/radio/gridtracker/default.nix diff --git a/pkgs/applications/radio/gridtracker/default.nix b/pkgs/applications/radio/gridtracker/default.nix new file mode 100644 index 000000000000..0e6216cdda42 --- /dev/null +++ b/pkgs/applications/radio/gridtracker/default.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, fetchFromGitLab +, nwjs +}: + +stdenv.mkDerivation rec { + pname = "gridtracker"; + version = "1.22.1226"; + + src = fetchFromGitLab { + owner = "gridtracker.org"; + repo = "gridtracker"; + rev = "v${version}"; + sha256 = "sha256-/Noc2aqHBjphX6RDqxQBI/OOKZgEnOndn0daBt1edXM="; + }; + + postPatch = '' + substituteInPlace Makefile \ + --replace '$(DESTDIR)/usr' '$(DESTDIR)/' + substituteInPlace gridtracker.sh \ + --replace "exec nw" "exec ${nwjs}/bin/nw" \ + --replace "/usr/share/gridtracker" "$out/share/gridtracker" + substituteInPlace gridtracker.desktop \ + --replace "/usr/share/gridtracker/gridview.png" "$out/share/gridtracker/gridview.png" + ''; + + makeFlags = [ "DESTDIR=$(out)" "NO_DIST_INSTALL=1" ]; + + meta = with lib; { + description = "An amateur radio companion to WSJT-X or JTDX"; + longDescription = '' + GridTracker listens to traffic from WSJT-X/JTDX, displays it on a map, + and has a sophisticated alerting and filtering system for finding and + working interesting stations. It also will upload QSO records to multiple + logging frameworks including Logbook of the World. + ''; + homepage = "https://gridtracker.org"; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = with maintainers; [ melling ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 967dcde1c9a5..d909e5ad1001 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7708,6 +7708,8 @@ with pkgs; libdevil = libdevil-nox; }; + gridtracker = callPackage ../applications/radio/gridtracker { }; + grin = callPackage ../tools/text/grin { }; gyb = callPackage ../tools/backup/gyb { }; From 2ee3ad53b22f2b638ab438236f9792311605a628 Mon Sep 17 00:00:00 2001 From: Matthias Thym Date: Mon, 2 Jan 2023 14:20:07 +0100 Subject: [PATCH 007/163] pyinfra: 2.6 -> 2.6.1 --- pkgs/development/python-modules/pyinfra/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyinfra/default.nix b/pkgs/development/python-modules/pyinfra/default.nix index dea53f6bb091..372b1cb02143 100644 --- a/pkgs/development/python-modules/pyinfra/default.nix +++ b/pkgs/development/python-modules/pyinfra/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pyinfra"; - version = "2.6"; + version = "2.6.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "Fizzadar"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-SNeucJvjnwQ0o+gukXwEKybBaW01hPtYXCFcPeOuXA8="; + hash = "sha256-TpO91YVWswcdpV4z9jkxBELwsIIGvlpL3URQTjAAkUs="; }; propagatedBuildInputs = [ @@ -63,7 +63,8 @@ buildPythonPackage rec { pyinfra automates/provisions/manages/deploys infrastructure. It can be used for ad-hoc command execution, service deployment, configuration management and more. ''; - homepage = "https://github.com/Fizzadar/pyinfra"; + homepage = "https://pyinfra.com"; + downloadPage = "https://pyinfra.com/Fizzadar/pyinfra/releases"; changelog = "https://github.com/Fizzadar/pyinfra/blob/v${version}/CHANGELOG.md"; maintainers = with maintainers; [ totoroot ]; license = licenses.mit; From 4fc374b314ab097d2105d3705eefdd5520b16ad1 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Tue, 3 Jan 2023 03:42:37 +0000 Subject: [PATCH 008/163] captive-browser: Use buildGoModule --- .../browsers/captive-browser/default.nix | 26 ++++++++++++++----- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/browsers/captive-browser/default.nix b/pkgs/applications/networking/browsers/captive-browser/default.nix index 035be9585ddd..ec24158635ee 100644 --- a/pkgs/applications/networking/browsers/captive-browser/default.nix +++ b/pkgs/applications/networking/browsers/captive-browser/default.nix @@ -1,17 +1,29 @@ -{ lib, fetchFromGitHub, buildGoPackage }: +{ lib, fetchFromGitHub, buildGoModule, fetchpatch }: -buildGoPackage rec { +buildGoModule rec { pname = "captive-browser"; - version = "2021-08-01"; - goPackagePath = pname; + version = "unstable-2021-08-01"; src = fetchFromGitHub { - owner = "FiloSottile"; - repo = "captive-browser"; - rev = "9c707dc32afc6e4146e19b43a3406329c64b6f3c"; + owner = "FiloSottile"; + repo = "captive-browser"; + rev = "9c707dc32afc6e4146e19b43a3406329c64b6f3c"; sha256 = "sha256-65lPo5tpE0M/VyyvlzlcVSuHX4AhhVuqK0UF4BIAH/Y="; }; + vendorHash = "sha256-2MFdQ2GIDAdLPuwAiGPO9wU3mm2BDXdyTwoVA1xVlcQ="; + deleteVendor = true; + + patches = [ + # Add go modules support + (fetchpatch { + url = "https://github.com/FiloSottile/captive-browser/commit/ef50837778ef4eaf38b19887e79c8b6fa830c342.patch"; + hash = "sha256-w+jDFeO94pMu4ir+G5CzqYlXxYOm9+YfyzbU3sbTyiY="; + }) + ]; + + ldflags = [ "-s" "-w" ]; + meta = with lib; { description = "Dedicated Chrome instance to log into captive portals without messing with DNS settings"; homepage = "https://blog.filippo.io/captive-browser"; From c09f6c3db0207702d95f966236c975a49beb29ee Mon Sep 17 00:00:00 2001 From: Michael Lohmann Date: Sat, 6 Feb 2021 18:32:26 +0100 Subject: [PATCH 009/163] nixos-version: output configurationRevision `nixos-version --configuration-revision` will show the configurationRevision. --- .../from_md/release-notes/rl-2305.section.xml | 7 +++++++ nixos/doc/manual/man-nixos-version.xml | 21 +++++++++++++++++++ .../manual/release-notes/rl-2305.section.md | 2 ++ .../modules/installer/tools/nixos-version.sh | 7 +++++++ 4 files changed, 37 insertions(+) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml index 4fb5749e71c8..91b23685f6e8 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml @@ -486,6 +486,13 @@ libax25 package. + + + nixos-version now accepts + --configuration-revision to display more + information about the current generation revision + + diff --git a/nixos/doc/manual/man-nixos-version.xml b/nixos/doc/manual/man-nixos-version.xml index fae25721e394..507c5035ed8d 100644 --- a/nixos/doc/manual/man-nixos-version.xml +++ b/nixos/doc/manual/man-nixos-version.xml @@ -21,6 +21,10 @@ + + + + @@ -118,6 +122,23 @@ + + + + + + + Show the configuration revision if available. This could be the full SHA1 + hash of the Git commit of the system flake, if you add + { system.configurationRevision = self.rev or "dirty"; } + to the modules array of your flake.nix system configuration e.g. +$ nixos-version --configuration-revision +aa314ebd1592f6cdd53cb5bba8bcae97d9323de8 + + + + + diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index b5c9c4ceb55d..00c5337df858 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -128,3 +128,5 @@ In addition to numerous new and upgraded packages, this release has the followin - The new option `services.tailscale.useRoutingFeatures` controls various settings for using Tailscale features like exit nodes and subnet routers. If you wish to use your machine as an exit node, you can set this setting to `server`, otherwise if you wish to use an exit node you can set this setting to `client`. The strict RPF warning has been removed as the RPF will be loosened automatically based on the value of this setting. - [Xastir](https://xastir.org/index.php/Main_Page) can now access AX.25 interfaces via the `libax25` package. + +- `nixos-version` now accepts `--configuration-revision` to display more information about the current generation revision diff --git a/nixos/modules/installer/tools/nixos-version.sh b/nixos/modules/installer/tools/nixos-version.sh index 59a9c572b418..8727cd2f876f 100644 --- a/nixos/modules/installer/tools/nixos-version.sh +++ b/nixos/modules/installer/tools/nixos-version.sh @@ -13,6 +13,13 @@ case "$1" in fi echo "@revision@" ;; + --configuration-revision) + if [[ "@configurationRevision@" =~ "@" ]]; then + echo "$0: configuration revision is unknown" >&2 + exit 1 + fi + echo "@configurationRevision@" + ;; --json) cat < Date: Tue, 3 Jan 2023 20:16:50 +0100 Subject: [PATCH 010/163] nixos-version: print error for missing revision to stderr --- nixos/modules/installer/tools/nixos-version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/installer/tools/nixos-version.sh b/nixos/modules/installer/tools/nixos-version.sh index 8727cd2f876f..39e34a3718cb 100644 --- a/nixos/modules/installer/tools/nixos-version.sh +++ b/nixos/modules/installer/tools/nixos-version.sh @@ -8,7 +8,7 @@ case "$1" in ;; --hash|--revision) if ! [[ @revision@ =~ ^[0-9a-f]+$ ]]; then - echo "$0: Nixpkgs commit hash is unknown" + echo "$0: Nixpkgs commit hash is unknown" >&2 exit 1 fi echo "@revision@" From 7a5b362ea10978a00dde812922388db2956dcb09 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Wed, 4 Jan 2023 23:46:35 +0100 Subject: [PATCH 011/163] dynamips: 0.2.22 -> 0.2.23 --- pkgs/applications/emulators/dynamips/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/emulators/dynamips/default.nix b/pkgs/applications/emulators/dynamips/default.nix index 9c7261f09301..80910700da93 100644 --- a/pkgs/applications/emulators/dynamips/default.nix +++ b/pkgs/applications/emulators/dynamips/default.nix @@ -4,17 +4,18 @@ , cmake , libelf , libpcap +, nix-update-script }: stdenv.mkDerivation rec { pname = "dynamips"; - version = "0.2.22"; + version = "0.2.23"; src = fetchFromGitHub { owner = "GNS3"; repo = pname; rev = "v${version}"; - sha256 = "1fjjjdaxlw1k95kyq73fndn21qfhrm4cn79av0i4sn7anhg8m83f"; + hash = "sha256-+h+WsZ/QrDd+dNrR6CJb2uMG+vbUvK8GTxFJZOxknL0="; }; nativeBuildInputs = [ cmake ]; @@ -22,6 +23,10 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DDYNAMIPS_CODE=stable" ]; + passthru = { + updateScript = nix-update-script { }; + }; + meta = with lib; { inherit (src.meta) homepage; description = "A Cisco router emulator"; From dea24b6610be436e65df7fc54ac9ad56c63d3209 Mon Sep 17 00:00:00 2001 From: Et7f3 Date: Mon, 2 Jan 2023 23:47:52 +0100 Subject: [PATCH 012/163] ocamlPackages.ocaml_libvirt: fix build on darwin --- pkgs/development/ocaml-modules/ocaml-libvirt/default.nix | 7 ++++++- pkgs/top-level/ocaml-packages.nix | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix index c321ca2bcb47..67741516af19 100644 --- a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, libvirt, autoreconfHook, pkg-config, ocaml, findlib, perl }: +{ lib, stdenv, fetchFromGitLab, libvirt, AppKit, Foundation, autoreconfHook, pkg-config, ocaml, findlib, perl }: lib.throwIfNot (lib.versionAtLeast ocaml.version "4.02") "libvirt is not available for OCaml ${ocaml.version}" @@ -18,6 +18,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config findlib perl ocaml ]; + buildInputs = lib.optionals stdenv.isDarwin [ + Foundation + AppKit + ]; + strictDeps = true; buildFlags = [ "all" "opt" "CPPFLAGS=-Wno-error" ]; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 10bb18908ca6..09947eb4bbbc 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -994,7 +994,9 @@ let ocamlgraph = callPackage ../development/ocaml-modules/ocamlgraph { }; ocamlgraph_gtk = callPackage ../development/ocaml-modules/ocamlgraph/gtk.nix { }; - ocaml_libvirt = callPackage ../development/ocaml-modules/ocaml-libvirt { }; + ocaml_libvirt = callPackage ../development/ocaml-modules/ocaml-libvirt { + inherit (pkgs.darwin.apple_sdk.frameworks) Foundation AppKit; + }; ocamlify = callPackage ../development/tools/ocaml/ocamlify { }; From 0a29695c1f488e7d1932baa572625bf668e975aa Mon Sep 17 00:00:00 2001 From: Et7f3 Date: Tue, 3 Jan 2023 01:06:14 +0100 Subject: [PATCH 013/163] ocamlPackages.labltk: fix build on darwin --- pkgs/development/ocaml-modules/labltk/default.nix | 4 ++-- pkgs/top-level/ocaml-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/labltk/default.nix b/pkgs/development/ocaml-modules/labltk/default.nix index fd7e59424547..4d5c4ae303e8 100644 --- a/pkgs/development/ocaml-modules/labltk/default.nix +++ b/pkgs/development/ocaml-modules/labltk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, makeWrapper, fetchzip, ocaml, findlib, tcl, tk }: +{ stdenv, lib, makeWrapper, fetchzip, Cocoa, ocaml, findlib, tcl, tk }: let params = @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-labltk"; nativeBuildInputs = [ ocaml findlib makeWrapper ]; - buildInputs = [ tcl tk ]; + buildInputs = [ tcl tk ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; configureFlags = [ "--use-findlib" "--installbindir" "$(out)/bin" ]; dontAddPrefix = true; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 09947eb4bbbc..f2816f20cbad 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -703,7 +703,9 @@ let then callPackage ../development/ocaml-modules/lablgtk-extras { } else callPackage ../development/ocaml-modules/lablgtk-extras/1.4.nix { }; - labltk = callPackage ../development/ocaml-modules/labltk { }; + labltk = callPackage ../development/ocaml-modules/labltk { + inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; + }; lacaml = callPackage ../development/ocaml-modules/lacaml { }; From 5c304acd4332e5e582572e1ef12947a563a91877 Mon Sep 17 00:00:00 2001 From: Et7f3 Date: Tue, 3 Jan 2023 02:01:29 +0100 Subject: [PATCH 014/163] ocamlPackages.gstreamer: fix build on darwin --- pkgs/development/ocaml-modules/gstreamer/default.nix | 4 ++-- pkgs/top-level/ocaml-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/gstreamer/default.nix b/pkgs/development/ocaml-modules/gstreamer/default.nix index 4ef3e98cb75e..34407299914a 100644 --- a/pkgs/development/ocaml-modules/gstreamer/default.nix +++ b/pkgs/development/ocaml-modules/gstreamer/default.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, pkg-config, glib, gst_all_1 }: +{ lib, stdenv, buildDunePackage, fetchFromGitHub, dune-configurator, AppKit, Foundation, pkg-config, glib, gst_all_1 }: buildDunePackage rec { pname = "gstreamer"; @@ -12,7 +12,7 @@ buildDunePackage rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ dune-configurator ]; + buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ AppKit Foundation ]; propagatedBuildInputs = [ glib.dev gst_all_1.gstreamer.dev gst_all_1.gst-plugins-base ]; CFLAGS_COMPILE = [ diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index f2816f20cbad..5e6ec1a742d3 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -522,7 +522,9 @@ let inherit (pkgs) gsl; }; - gstreamer = callPackage ../development/ocaml-modules/gstreamer { }; + gstreamer = callPackage ../development/ocaml-modules/gstreamer { + inherit (pkgs.darwin.apple_sdk.frameworks) AppKit Foundation; + }; h2 = callPackage ../development/ocaml-modules/h2 { }; From 9a5b1e495fdd63232c1469a4f982c3e86f6ce39f Mon Sep 17 00:00:00 2001 From: Et7f3 Date: Tue, 3 Jan 2023 02:03:17 +0100 Subject: [PATCH 015/163] ocamlPackages.ffmpeg-avutil: fix build on darwin --- pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix | 5 +++-- pkgs/top-level/ocaml-packages.nix | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix index 121fb115146e..7635fb6d1218 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix @@ -1,4 +1,5 @@ -{ lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage +{ lib, stdenv, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage +, AudioToolbox, VideoToolbox , ffmpeg-base ? callPackage ./base.nix { } , ffmpeg }: @@ -11,7 +12,7 @@ buildDunePackage { inherit (ffmpeg-base) version src useDune2; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ dune-configurator ]; + buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ AudioToolbox VideoToolbox ]; propagatedBuildInputs = [ ffmpeg.dev ]; doCheck = true; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 5e6ec1a742d3..1e91050020a2 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -448,6 +448,7 @@ let ffmpeg = callPackage ../development/ocaml-modules/ffmpeg { }; ffmpeg-avutil = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix { inherit (pkgs) ffmpeg; + inherit (pkgs.darwin.apple_sdk.frameworks) AudioToolbox VideoToolbox; }; ffmpeg-avcodec = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix { inherit (pkgs) ffmpeg; From d66b3c77e50f5bd8daad425090d9fc639e8719d1 Mon Sep 17 00:00:00 2001 From: Et7f3 Date: Tue, 3 Jan 2023 02:05:58 +0100 Subject: [PATCH 016/163] ocamlPackages.bjack: fix build on darwin --- pkgs/development/ocaml-modules/bjack/default.nix | 4 ++-- pkgs/top-level/ocaml-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/bjack/default.nix b/pkgs/development/ocaml-modules/bjack/default.nix index fa03194bde4a..a102d27c2879 100644 --- a/pkgs/development/ocaml-modules/bjack/default.nix +++ b/pkgs/development/ocaml-modules/bjack/default.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, libsamplerate, libjack2 }: +{ lib, stdenv, buildDunePackage, fetchFromGitHub, Accelerate, CoreAudio, dune-configurator, libsamplerate, libjack2 }: buildDunePackage rec { pname = "bjack"; @@ -13,7 +13,7 @@ buildDunePackage rec { sha256 = "1gf31a8i9byp6npn0x6gydcickn6sf5dnzmqr2c1b9jn2nl7334c"; }; - buildInputs = [ dune-configurator ]; + buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ Accelerate CoreAudio ]; propagatedBuildInputs = [ libsamplerate libjack2 ]; meta = with lib; { diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 1e91050020a2..7dc7afef4302 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -86,7 +86,9 @@ let bitv = callPackage ../development/ocaml-modules/bitv { }; - bjack = callPackage ../development/ocaml-modules/bjack { }; + bjack = callPackage ../development/ocaml-modules/bjack { + inherit (pkgs.darwin.apple_sdk.frameworks) Accelerate CoreAudio; + }; bls12-381 = callPackage ../development/ocaml-modules/bls12-381 { }; bls12-381-gen = callPackage ../development/ocaml-modules/bls12-381/gen.nix { }; From be7dbbe58910b4f41db4fdb1aa7503d7da02845a Mon Sep 17 00:00:00 2001 From: Et7f3 Date: Thu, 5 Jan 2023 03:50:22 +0100 Subject: [PATCH 017/163] ocamlPackages.ffmpeg-avcodec: fix build on darwin --- pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix | 6 +++++- pkgs/top-level/ocaml-packages.nix | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix index 8ee5428c473e..442c80ab6a12 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix @@ -1,6 +1,9 @@ { lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage +, AudioToolbox , ffmpeg-base ? callPackage ./base.nix { } , ffmpeg-avutil, ffmpeg +, stdenv +, VideoToolbox }: buildDunePackage { @@ -11,7 +14,8 @@ buildDunePackage { inherit (ffmpeg-base) version src useDune2; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ dune-configurator ]; + buildInputs = [ dune-configurator ] + ++ lib.optionals stdenv.isDarwin [ AudioToolbox VideoToolbox ]; propagatedBuildInputs = [ ffmpeg-avutil ffmpeg.dev ]; doCheck = true; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 7dc7afef4302..dc22136e03a9 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -454,6 +454,7 @@ let }; ffmpeg-avcodec = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix { inherit (pkgs) ffmpeg; + inherit (pkgs.darwin.apple_sdk.frameworks) AudioToolbox VideoToolbox; }; ffmpeg-avfilter = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix { inherit (pkgs) ffmpeg; From eddbd3d8e28368b6765937904a12b1682b092f15 Mon Sep 17 00:00:00 2001 From: Et7f3 Date: Thu, 5 Jan 2023 03:55:58 +0100 Subject: [PATCH 018/163] ocamlPackages.ffmpeg-avfilter: fix build on darwin --- pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix | 8 +++++++- pkgs/top-level/ocaml-packages.nix | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix index 6479bbe55bf6..3b3b94988b17 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix @@ -1,6 +1,11 @@ { lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage +, AppKit +, CoreImage , ffmpeg-base ? callPackage ./base.nix { } , ffmpeg-avutil, ffmpeg +, OpenGL +, stdenv +, VideoToolbox }: buildDunePackage { @@ -11,7 +16,8 @@ buildDunePackage { inherit (ffmpeg-base) version src useDune2; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ dune-configurator ]; + buildInputs = [ dune-configurator ] + ++ lib.optionals stdenv.isDarwin [ AppKit CoreImage OpenGL VideoToolbox ]; propagatedBuildInputs = [ ffmpeg-avutil ffmpeg.dev ]; doCheck = true; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index dc22136e03a9..be775dc8359a 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -458,6 +458,7 @@ let }; ffmpeg-avfilter = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix { inherit (pkgs) ffmpeg; + inherit (pkgs.darwin.apple_sdk.frameworks) AppKit CoreImage OpenGL VideoToolbox; }; ffmpeg-swscale = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix { inherit (pkgs) ffmpeg; From 50f77e3b9d0c2dde4ca4a8ac6f614e58b0effbf7 Mon Sep 17 00:00:00 2001 From: Et7f3 Date: Thu, 5 Jan 2023 03:58:45 +0100 Subject: [PATCH 019/163] ocamlPackages.ffmpeg-swscale: fix build on darwin --- pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix | 4 +++- pkgs/top-level/ocaml-packages.nix | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix index 9d97b722551b..f39ffbc96fa0 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix @@ -1,6 +1,8 @@ { lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage , ffmpeg-base ? callPackage ./base.nix { } , ffmpeg-avutil, ffmpeg +, stdenv +, VideoToolbox }: buildDunePackage { @@ -11,7 +13,7 @@ buildDunePackage { inherit (ffmpeg-base) version src useDune2; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ dune-configurator ]; + buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ VideoToolbox ]; propagatedBuildInputs = [ ffmpeg-avutil ffmpeg.dev ]; doCheck = true; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index be775dc8359a..5198e7078429 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -462,6 +462,7 @@ let }; ffmpeg-swscale = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix { inherit (pkgs) ffmpeg; + inherit (pkgs.darwin.apple_sdk.frameworks) VideoToolbox; }; ffmpeg-swresample = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix { inherit (pkgs) ffmpeg; From 278da9f0932f1352e410a34835369e92e757bfe3 Mon Sep 17 00:00:00 2001 From: Et7f3 Date: Thu, 5 Jan 2023 04:04:43 +0100 Subject: [PATCH 020/163] ocamlPackages.ffmpeg-av: fix build on darwin --- pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix | 8 ++++++-- pkgs/top-level/ocaml-packages.nix | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix index e8d71aa321e0..8c4d4e8c23c4 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix @@ -1,6 +1,10 @@ { lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage +, AudioToolbox , ffmpeg-base ? callPackage ./base.nix { } -, ffmpeg-avutil, ffmpeg-avcodec, ffmpeg }: +, ffmpeg-avutil, ffmpeg-avcodec, ffmpeg +, stdenv +, VideoToolbox +}: buildDunePackage { pname = "ffmpeg-av"; @@ -10,7 +14,7 @@ buildDunePackage { inherit (ffmpeg-base) version src useDune2; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ dune-configurator ]; + buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ AudioToolbox VideoToolbox ]; propagatedBuildInputs = [ ffmpeg-avutil ffmpeg-avcodec ffmpeg.dev ]; doCheck = true; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 5198e7078429..f791d7a5d423 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -469,6 +469,7 @@ let }; ffmpeg-av = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-av.nix { inherit (pkgs) ffmpeg; + inherit (pkgs.darwin.apple_sdk.frameworks) AudioToolbox VideoToolbox; }; ffmpeg-avdevice = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix { inherit (pkgs) ffmpeg; From 699b87b8a420207446cb76034874d0a90fbbd5c2 Mon Sep 17 00:00:00 2001 From: Et7f3 Date: Thu, 5 Jan 2023 04:14:30 +0100 Subject: [PATCH 021/163] ocamlPackages.ffmpeg-avdevice: fix build on darwin --- .../ocaml-modules/ffmpeg/ffmpeg-avdevice.nix | 11 ++++++++++- pkgs/top-level/ocaml-packages.nix | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix index e6641a6ca030..72180afb9614 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix @@ -1,6 +1,14 @@ { lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage +, AppKit +, AudioToolbox +, Cocoa +, CoreImage +, ForceFeedback , ffmpeg-base ? callPackage ./base.nix { } , ffmpeg-av, ffmpeg +, OpenGL +, stdenv +, VideoToolbox }: buildDunePackage { @@ -11,7 +19,8 @@ buildDunePackage { inherit (ffmpeg-base) version src useDune2; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ dune-configurator ]; + buildInputs = [ dune-configurator ] + ++ lib.optionals stdenv.isDarwin [ AppKit AudioToolbox Cocoa CoreImage ForceFeedback OpenGL VideoToolbox ]; propagatedBuildInputs = [ ffmpeg-av ffmpeg.dev ]; doCheck = true; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index f791d7a5d423..d6cb2d2d80f6 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -473,6 +473,7 @@ let }; ffmpeg-avdevice = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix { inherit (pkgs) ffmpeg; + inherit (pkgs.darwin.apple_sdk.frameworks) AppKit AudioToolbox Cocoa CoreImage ForceFeedback OpenGL VideoToolbox; }; fiber = callPackage ../development/ocaml-modules/fiber { }; From 50100d192e31e444261bb2f3ff4f54cfdbbcb788 Mon Sep 17 00:00:00 2001 From: Et7f3 Date: Thu, 5 Jan 2023 04:18:07 +0100 Subject: [PATCH 022/163] ocamlPackages.ffmpeg-swresample: fix build on darwin --- pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix | 4 +++- pkgs/top-level/ocaml-packages.nix | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix index 92011e48eab6..801e00b6155f 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix @@ -1,6 +1,8 @@ { lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage , ffmpeg-base ? callPackage ./base.nix { } , ffmpeg-avutil, ffmpeg-avcodec, ffmpeg +, stdenv +, VideoToolbox }: buildDunePackage { @@ -11,7 +13,7 @@ buildDunePackage { inherit (ffmpeg-base) version src useDune2; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ dune-configurator ]; + buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ VideoToolbox ]; propagatedBuildInputs = [ ffmpeg-avutil ffmpeg-avcodec ffmpeg.dev ]; doCheck = true; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index d6cb2d2d80f6..2488dc579c4d 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -466,6 +466,7 @@ let }; ffmpeg-swresample = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix { inherit (pkgs) ffmpeg; + inherit (pkgs.darwin.apple_sdk.frameworks) VideoToolbox; }; ffmpeg-av = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-av.nix { inherit (pkgs) ffmpeg; From 974ed2cc0764ce906765365b7d97ee957f01a716 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Thu, 5 Jan 2023 22:32:43 +0100 Subject: [PATCH 023/163] usql: 0.13.4 -> 0.13.5 --- pkgs/applications/misc/usql/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/usql/default.nix b/pkgs/applications/misc/usql/default.nix index edee8a37fe7a..95c3153eeb08 100644 --- a/pkgs/applications/misc/usql/default.nix +++ b/pkgs/applications/misc/usql/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , fetchFromGitHub , buildGoModule , unixODBC @@ -11,18 +10,18 @@ buildGoModule rec { pname = "usql"; - version = "0.13.4"; + version = "0.13.5"; src = fetchFromGitHub { owner = "xo"; repo = "usql"; rev = "v${version}"; - hash = "sha256-YshGqp27N1iOBWSE9UH1zsQlFar2uKf4Jq2W8kSN0Qc="; + hash = "sha256-Tsv2nUlxu/nUsupQgYn1CAy/mrwq14OEFZErgO34thU="; }; buildInputs = [ unixODBC icu ]; - vendorHash = "sha256-qHs5Z7NRdQKPOmYSozhSVQfINMxJewVwQ1Gi4SMWT+8="; + vendorHash = "sha256-Zd8/1i9YwVoOoJ1NG5gMGB781IbNBL5lfkrSwYNn9Hg="; proxyVendor = true; # Exclude broken impala & hive driver From 8065069c54c21c7cc8d6aed7726c5d5acf21b666 Mon Sep 17 00:00:00 2001 From: Matheus Vieira Date: Thu, 5 Jan 2023 18:52:26 -0300 Subject: [PATCH 024/163] quartus-prime-lite: add missing libcrypt.so.1 --- pkgs/applications/editors/quartus-prime/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/editors/quartus-prime/default.nix b/pkgs/applications/editors/quartus-prime/default.nix index d8e57fdb508f..50eacf97bf85 100644 --- a/pkgs/applications/editors/quartus-prime/default.nix +++ b/pkgs/applications/editors/quartus-prime/default.nix @@ -44,6 +44,7 @@ in buildFHSUserEnv rec { xorg.libXext xorg.libXrender libudev0-shim + libxcrypt ]; passthru = { inherit unwrapped; }; From c0c6e9252cf598989c9e44ee940ed414054c2c49 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Fri, 6 Jan 2023 03:22:58 +0100 Subject: [PATCH 025/163] python310Packages.email-validator: 1.2.1 -> 1.3.0 --- pkgs/development/python-modules/email-validator/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/email-validator/default.nix b/pkgs/development/python-modules/email-validator/default.nix index cb553c4fd5f6..1307f4039ec9 100644 --- a/pkgs/development/python-modules/email-validator/default.nix +++ b/pkgs/development/python-modules/email-validator/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "email-validator"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "JoshData"; repo = "python-${pname}"; rev = "refs/tags/v${version}"; - sha256 = "sha256-Avsqaev3LMoymU06y+u8MMv38ZI2cWk5tc/MkO+9oyA="; + hash = "sha256-mflUF2ZKYhCiQEoG+fKI+K266dukuSzG9cyg6gwBcTo="; }; propagatedBuildInputs = [ @@ -47,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "A robust email syntax and deliverability validation library"; homepage = "https://github.com/JoshData/python-email-validator"; + changelog = "https://github.com/JoshData/python-email-validator/releases/tag/v${version}"; license = licenses.cc0; maintainers = with maintainers; [ siddharthist ]; }; From c4682d250d67b4bea93233b6ac7206ac0816e8c6 Mon Sep 17 00:00:00 2001 From: D Anzorge Date: Tue, 20 Dec 2022 03:23:56 +0100 Subject: [PATCH 026/163] git-bug: don't build unneeded packages, misc changes * install fish completions * meta.license update based on note in README --- .../version-management/git-bug/default.nix | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/version-management/git-bug/default.nix b/pkgs/applications/version-management/git-bug/default.nix index b85681a73cd9..45c0557c30ad 100644 --- a/pkgs/applications/version-management/git-bug/default.nix +++ b/pkgs/applications/version-management/git-bug/default.nix @@ -1,42 +1,43 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "git-bug"; - version = "0.8.0"; # the `rev` below pins the version of the source to get - rev = "v0.8.0"; + version = "0.8.0"; src = fetchFromGitHub { - inherit rev; owner = "MichaelMure"; repo = "git-bug"; + rev = "v${version}"; sha256 = "12byf6nsamwz0ssigan1z299s01cyh8bhgj86bibl90agd4zs9n8"; }; vendorSha256 = "sha256-32kNDoBE50Jx1Ef9YwhDk7nd3CaTSnHPlu7PgWPUGfE="; + nativeBuildInputs = [ installShellFiles ]; + doCheck = false; + excludedPackages = [ "doc" "misc" ]; + ldflags = [ - "-X github.com/MichaelMure/git-bug/commands.GitCommit=${rev}" + "-X github.com/MichaelMure/git-bug/commands.GitCommit=v${version}" "-X github.com/MichaelMure/git-bug/commands.GitLastTag=${version}" "-X github.com/MichaelMure/git-bug/commands.GitExactTag=${version}" ]; postInstall = '' - install -D -m 0644 misc/completion/bash/git-bug "$out/share/bash-completion/completions/git-bug" - install -D -m 0644 misc/completion/zsh/git-bug "$out/share/zsh/site-functions/git-bug" - install -D -m 0644 -t "$out/share/man/man1" doc/man/* + installShellCompletion \ + --bash misc/completion/bash/git-bug \ + --zsh misc/completion/zsh/git-bug \ + --fish misc/completion/fish/git-bug - # not sure why the following executables are in $out/bin/ - rm -f $out/bin/cmd - rm -f $out/bin/completion - rm -f $out/bin/doc + installManPage doc/man/* ''; meta = with lib; { description = "Distributed bug tracker embedded in Git"; homepage = "https://github.com/MichaelMure/git-bug"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ royneary ]; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ royneary DeeUnderscore ]; }; } From 2d6f90f6679c91ea325660105b75fabf7ddfd3b0 Mon Sep 17 00:00:00 2001 From: D Anzorge Date: Wed, 4 Jan 2023 22:18:00 +0100 Subject: [PATCH 027/163] git-bug-migration: init at 0.3.4 --- .../from_md/release-notes/rl-2305.section.xml | 8 +++++ .../manual/release-notes/rl-2305.section.md | 2 ++ .../git-bug-migration/default.nix | 34 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 4 files changed, 46 insertions(+) create mode 100644 pkgs/applications/version-management/git-bug-migration/default.nix diff --git a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml index 12e4d490300e..46b379262d01 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml @@ -124,6 +124,14 @@ before upgrading their systems. + + + git-bug has been updated to at least + version 0.8.0, which includes backwards incompatible changes. + The git-bug-migration package can be used + to upgrade existing repositories. + + The EC2 image module no longer fetches instance metadata in diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index 07ee346c2c87..987446c0517e 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -42,6 +42,8 @@ In addition to numerous new and upgraded packages, this release has the followin - `podman` now uses the `netavark` network stack. Users will need to delete all of their local containers, images, volumes, etc, by running `podman system reset --force` once before upgrading their systems. +- `git-bug` has been updated to at least version 0.8.0, which includes backwards incompatible changes. The `git-bug-migration` package can be used to upgrade existing repositories. + - The EC2 image module no longer fetches instance metadata in stage-1. This results in a significantly smaller initramfs, since network drivers no longer need to be included, and faster boots, since metadata fetching can happen in parallel with startup of other services. This breaks services which rely on metadata being present by the time stage-2 is entered. Anything which reads EC2 metadata from `/etc/ec2-metadata` should now have an `after` dependency on `fetch-ec2-metadata.service` diff --git a/pkgs/applications/version-management/git-bug-migration/default.nix b/pkgs/applications/version-management/git-bug-migration/default.nix new file mode 100644 index 000000000000..53c496ae009a --- /dev/null +++ b/pkgs/applications/version-management/git-bug-migration/default.nix @@ -0,0 +1,34 @@ +{ lib, buildGoModule, fetchFromGitHub, git }: +buildGoModule rec { + pname = "git-bug-migration"; + version = "0.3.4"; + + src = fetchFromGitHub { + owner = "MichaelMure"; + repo = "git-bug-migration"; + rev = "v${version}"; + hash = "sha256-IOBgrU3C0ZHD2wx9LRVgKEJzDlUj6z2UXlHGU3tdTdQ="; + }; + + vendorSha256 = "sha256-Hid9OK91LNjLmDHam0ZlrVQopVOsqbZ+BH2rfQi5lS0="; + + checkInputs = [ git ]; + + ldflags = [ + "-X main.GitExactTag=${version}" + "-X main.GitLastTag=${version}" + ]; + + preCheck = '' + export HOME=$(mktemp -d) + git config --global user.name 'Nixpkgs Test User' + git config --global user.email 'nobody@localhost' + ''; + + meta = with lib; { + description = "Tool for upgrading repositories using git-bug to new versions"; + homepage = "https://github.com/MichaelMure/git-bug-migration"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ DeeUnderscore ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 678a2f20519e..de530d92f0c9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1684,6 +1684,8 @@ with pkgs; git-bug = callPackage ../applications/version-management/git-bug { }; + git-bug-migration = callPackage ../applications/version-management/git-bug-migration { }; + git-chglog = callPackage ../applications/version-management/git-chglog { }; git-cinnabar = callPackage ../applications/version-management/git-cinnabar { From 56f3cb523ec8224099663f35a0e27a4aabbfc033 Mon Sep 17 00:00:00 2001 From: Eric Wolf Date: Sat, 7 Jan 2023 09:00:40 +0100 Subject: [PATCH 028/163] timescaledb: 2.9.0 -> 2.9.1 --- pkgs/servers/sql/postgresql/ext/timescaledb.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 4c612c8b8e9f..52a3ff1b6824 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "timescaledb"; - version = "2.9.0"; + version = "2.9.1"; nativeBuildInputs = [ cmake ]; buildInputs = [ postgresql openssl libkrb5 ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "timescale"; repo = "timescaledb"; rev = version; - sha256 = "sha256-N/syMGr4NUiiP8J3cD7yhJW8nuYsTBSsuFYHdNeb16Y="; + sha256 = "sha256-fvVSxDiGZAewyuQ2vZDb0I6tmlDXl6trjZp8+qDBtb8="; }; cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" "-DTAP_CHECKS=OFF" ] From 38477e3df0a98329abdddb23448ad01da52d002b Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sat, 7 Jan 2023 11:40:29 +0100 Subject: [PATCH 029/163] exiftool: 12.52 -> 12.54 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 624eacbd26f1..94d65dc5a66d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12507,11 +12507,11 @@ let ImageExifTool = buildPerlPackage rec { pname = "Image-ExifTool"; - version = "12.52"; + version = "12.54"; src = fetchurl { url = "https://exiftool.org/Image-ExifTool-${version}.tar.gz"; - hash = "sha256-yH8RlkTRAanHYNyq5Vi52W8mGKIJwmGZsWhzyokz+ao="; + hash = "sha256-KnT6le0CfqS8yP/qpx4HgVsJmp38oPQIc36tNUzpfc8="; }; nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; From 65f893aabfdb99dc21308e60a80e08317dcafef8 Mon Sep 17 00:00:00 2001 From: maralorn Date: Sun, 8 Jan 2023 18:22:20 +0100 Subject: [PATCH 030/163] all-cabal-hashes: 2023-01-06T18:29:38Z -> 2023-01-08T15:35:40Z This commit has been generated by maintainers/scripts/haskell/update-hackage.sh --- pkgs/data/misc/hackage/pin.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index 9ef7aa2d03d9..9e14413b745c 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "9f677e1d2267621375d22e3f6c1a25246678be4c", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/9f677e1d2267621375d22e3f6c1a25246678be4c.tar.gz", - "sha256": "0y2mbj8dwfgdz5pzdq682clab10xgnqlrfv1najx53yy5jf63pcv", - "msg": "Update from Hackage at 2023-01-06T18:29:38Z" + "commit": "39a6ef760cb2f514e170dc40e7ec1f7699722e7d", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/39a6ef760cb2f514e170dc40e7ec1f7699722e7d.tar.gz", + "sha256": "1s9w4g4dar9blr3vvy9pf18qxcgyvrrdnc65jrkx75gr9dr3247w", + "msg": "Update from Hackage at 2023-01-08T15:35:40Z" } From 8daeaf6e1dc5b2a6be1689ce0fe01fc5ec8b9f58 Mon Sep 17 00:00:00 2001 From: maralorn Date: Sun, 8 Jan 2023 18:23:22 +0100 Subject: [PATCH 031/163] haskellPackages: regenerate package set based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- .../haskell-modules/hackage-packages.nix | 367 ++++++++++++++---- 1 file changed, 282 insertions(+), 85 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 80aefc917302..9f3a055860c5 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -5994,6 +5994,24 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "FailT" = callPackage + ({ mkDerivation, base, doctest, exceptions, hspec, mtl, QuickCheck + , quickcheck-classes, text + }: + mkDerivation { + pname = "FailT"; + version = "0.1.0.0"; + sha256 = "13ai9w5i3ay3v0skn32fllymnywd77zdr4lvf16k99lnimbzzm6y"; + revision = "2"; + editedCabalFile = "1cvw3icblydaid9w74dqaprsp8556zapr4ajw8qi8iw8y3kss891"; + libraryHaskellDepends = [ base exceptions mtl text ]; + testHaskellDepends = [ + base doctest exceptions hspec mtl QuickCheck quickcheck-classes + ]; + description = "A 'FailT' monad transformer that plays well with 'MonadFail'"; + license = lib.licenses.bsd3; + }) {}; + "FailureT" = callPackage ({ mkDerivation, base, base-unicode-symbols, mmtl }: mkDerivation { @@ -9998,6 +10016,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "HaTeX_3_22_3_2" = callPackage + ({ mkDerivation, base, bibtex, bytestring, containers, hashable + , matrix, parsec, prettyprinter, QuickCheck, tasty + , tasty-quickcheck, text, transformers + }: + mkDerivation { + pname = "HaTeX"; + version = "3.22.3.2"; + sha256 = "1hxj661nkaylh46xrwddj8zm1gb64714yz7jk1afmy5n4yzsqdzj"; + libraryHaskellDepends = [ + base bibtex bytestring containers hashable matrix parsec + prettyprinter QuickCheck text transformers + ]; + testHaskellDepends = [ + base parsec QuickCheck tasty tasty-quickcheck text + ]; + description = "The Haskell LaTeX library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "HaTeX-meta" = callPackage ({ mkDerivation, base, Cabal, containers, directory, filepath, ghc , haddock, haskell-src-exts, mtl, parsec @@ -35110,15 +35149,15 @@ self: { license = lib.licenses.asl20; }) {}; - "ascii_1_4_2_0" = callPackage + "ascii_1_5_1_0" = callPackage ({ mkDerivation, ascii-case, ascii-caseless, ascii-char , ascii-group, ascii-numbers, ascii-predicates, ascii-superset , ascii-th, base, bytestring, hspec, text }: mkDerivation { pname = "ascii"; - version = "1.4.2.0"; - sha256 = "0ql2g9fapm9vzdfpnvax7884cl80s1s61ki98mmy6mjxszlry9jp"; + version = "1.5.1.0"; + sha256 = "01a2xrkk60bpbz4x337jp66fy7zhdpb2c649c62inx723cc1q4il"; libraryHaskellDepends = [ ascii-case ascii-caseless ascii-char ascii-group ascii-numbers ascii-predicates ascii-superset ascii-th base bytestring text @@ -35416,14 +35455,14 @@ self: { license = lib.licenses.asl20; }) {}; - "ascii-superset_1_2_4_0" = callPackage + "ascii-superset_1_2_5_0" = callPackage ({ mkDerivation, ascii-case, ascii-caseless, ascii-char, base , bytestring, hashable, hspec, text }: mkDerivation { pname = "ascii-superset"; - version = "1.2.4.0"; - sha256 = "0gh7k9fjh5l2a8xdd964gd4fy0lmfz9y0pnfykx7wiqiqirv2v4y"; + version = "1.2.5.0"; + sha256 = "00i662bwrsqj34g0d9awgik2vqxxlr8y2v1xyyrhhqh5fi3s0rwk"; libraryHaskellDepends = [ ascii-case ascii-caseless ascii-char base bytestring hashable text ]; @@ -35472,16 +35511,14 @@ self: { license = lib.licenses.asl20; }) {}; - "ascii-th_1_1_1_0" = callPackage + "ascii-th_1_2_0_0" = callPackage ({ mkDerivation, ascii-case, ascii-caseless, ascii-char , ascii-superset, base, bytestring, hspec, template-haskell, text }: mkDerivation { pname = "ascii-th"; - version = "1.1.1.0"; - sha256 = "1jfjj7rir0bbbasvdb11ymcpjk4zv0br5sk2839hnnlgam9a75g5"; - revision = "1"; - editedCabalFile = "06dsa4nrpvy1sm4hr4q6ydgjizf4r7s9xvlc9ra4f8mawsq85zx6"; + version = "1.2.0.0"; + sha256 = "07v6795rfwb8h4x31kc7vdmwg9z23jf4418dcv612c27dqhx4hbg"; libraryHaskellDepends = [ ascii-case ascii-caseless ascii-char ascii-superset base template-haskell @@ -52696,17 +52733,17 @@ self: { "cabal-plan-bounds" = callPackage ({ mkDerivation, base, bytestring, cabal-plan, Cabal-syntax - , containers, optparse-applicative, text + , containers, optparse-applicative, pretty, text }: mkDerivation { pname = "cabal-plan-bounds"; - version = "0.1.0.1"; - sha256 = "1s8ljyp8bi0h637abxq4ma2m5bx8cpiw5ib6n50npprycv9h3v04"; + version = "0.1.3"; + sha256 = "0bngpl6j5q11axra38802qgyh1crghdq89dsfpfhyllyrkcmwci6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bytestring cabal-plan Cabal-syntax containers - optparse-applicative text + optparse-applicative pretty text ]; description = "Derives cabal bounds from build plans"; license = lib.licenses.bsd2; @@ -63361,6 +63398,30 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "comfort-array_0_5_2" = callPackage + ({ mkDerivation, base, ChasingBottoms, containers, deepseq + , doctest-exitcode-stdio, doctest-lib, guarded-allocation + , non-empty, prelude-compat, primitive, QuickCheck, semigroups + , storable-record, storablevector, tagged, transformers, utility-ht + }: + mkDerivation { + pname = "comfort-array"; + version = "0.5.2"; + sha256 = "0rpv9mn1jmkb9f89y02zfg2vwz4slzny31yjrvwcm43jhdyvzkwh"; + libraryHaskellDepends = [ + base containers deepseq guarded-allocation non-empty prelude-compat + primitive QuickCheck semigroups storable-record storablevector + tagged transformers utility-ht + ]; + testHaskellDepends = [ + base ChasingBottoms containers deepseq doctest-exitcode-stdio + doctest-lib QuickCheck tagged + ]; + description = "Arrays where the index type is a function of the shape type"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "comfort-array-shape" = callPackage ({ mkDerivation, base, ChasingBottoms, comfort-array, containers , doctest-exitcode-stdio, doctest-lib, fixed-length, non-empty @@ -63413,6 +63474,8 @@ self: { pname = "comfort-glpk"; version = "0.0"; sha256 = "16cg5bc1a04zz23bhgfai9bgllwdkl975j9l7r9im8l9qn7ah1xy"; + revision = "1"; + editedCabalFile = "12d7vmy8nas78gzq2s3a9gbpffbv4afjnkqzrdmgnzj3jkljzc7p"; libraryHaskellDepends = [ base comfort-array deepseq glpk-headers non-empty utility-ht ]; @@ -68618,8 +68681,8 @@ self: { }: mkDerivation { pname = "copilot"; - version = "3.12"; - sha256 = "0svbn9djzxqbmi62106i2692fx31vdxqjjd2y329nlq36iivvyxf"; + version = "3.13"; + sha256 = "1a6r3r1q6vqxmwdj89bmvbzrlkfyyzq6i84ydg756wsvm6mipq7a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -68637,8 +68700,8 @@ self: { }: mkDerivation { pname = "copilot-c99"; - version = "3.12"; - sha256 = "0xxvdl1k09il545y263k5x37gi5z1y4plm8f4yjqh3hprv23ffhp"; + version = "3.13"; + sha256 = "112lmmylylq9jwcj0diy3fqn9kbs8xkyqc9l7n5jjy5h3yak8d2c"; libraryHaskellDepends = [ base copilot-core directory filepath language-c99 language-c99-simple mtl pretty @@ -68665,14 +68728,14 @@ self: { }) {}; "copilot-core" = callPackage - ({ mkDerivation, base, dlist, HUnit, pretty, QuickCheck - , test-framework, test-framework-hunit, test-framework-quickcheck2 + ({ mkDerivation, base, HUnit, pretty, QuickCheck, test-framework + , test-framework-hunit, test-framework-quickcheck2 }: mkDerivation { pname = "copilot-core"; - version = "3.12"; - sha256 = "1aw6pkxqpcwqib86yq2zvjz6jqxjc3ina0hbxsyvmgmcqs5hwybs"; - libraryHaskellDepends = [ base dlist pretty ]; + version = "3.13"; + sha256 = "0i05bpiag7prr3xn361psda7ncfyrgbd6rjsy23rkf4ygmb2908p"; + libraryHaskellDepends = [ base pretty ]; testHaskellDepends = [ base HUnit pretty QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 @@ -68705,8 +68768,8 @@ self: { }: mkDerivation { pname = "copilot-interpreter"; - version = "3.12"; - sha256 = "100nalpd7q9z26nyk06nbl4hr8p6akm8qny988zd8znp2c3z37rr"; + version = "3.13"; + sha256 = "0z03qlafv53sxp50j9ccp1pgfs3nqm4l7m18cxzflzzn6j3bnrjy"; libraryHaskellDepends = [ base copilot-core pretty ]; testHaskellDepends = [ base copilot-core copilot-prettyprinter pretty QuickCheck @@ -68724,8 +68787,8 @@ self: { }: mkDerivation { pname = "copilot-language"; - version = "3.12"; - sha256 = "1n2n83617wi0piw94g843zk39xvralcn7l8vdcvbx6gwqm9dn320"; + version = "3.13"; + sha256 = "060lr6m9kp204qyjga6xl879ypv648wm6gh33w10x5jlzghabl4d"; libraryHaskellDepends = [ array base containers copilot-core copilot-interpreter copilot-prettyprinter copilot-theorem data-reify mtl @@ -68743,8 +68806,8 @@ self: { ({ mkDerivation, base, containers, copilot-language, mtl, parsec }: mkDerivation { pname = "copilot-libraries"; - version = "3.12"; - sha256 = "0xxfz2r04x0cwyidlfd792v4jspv38v8w012w0dmr0ajsw15npxb"; + version = "3.13"; + sha256 = "05ffpp2h83l0wvddfmi6m42c79qsw07dfmx8bmj2zwfhhikp043r"; libraryHaskellDepends = [ base containers copilot-language mtl parsec ]; @@ -68757,8 +68820,8 @@ self: { ({ mkDerivation, base, copilot-core, pretty }: mkDerivation { pname = "copilot-prettyprinter"; - version = "3.12"; - sha256 = "1sj4fjj6kwarjxn53qrfvl0ca200ra9hnh8mrisc4jr87xhdbnh0"; + version = "3.13"; + sha256 = "04ivmsrb51j7agmb1nimzxp0srkkv52qi49qxishf8gj4jnhm10p"; libraryHaskellDepends = [ base copilot-core pretty ]; description = "A prettyprinter of Copilot Specifications"; license = lib.licenses.bsd3; @@ -68788,8 +68851,8 @@ self: { }: mkDerivation { pname = "copilot-theorem"; - version = "3.12"; - sha256 = "1q0r8fa4jvqpkiy099f9fmrcm2qy0wrvxwkaycbqlhgx1zixxl3z"; + version = "3.13"; + sha256 = "0q0pfnaayldy1h62qj25ksfc9v2vyp5aiy3b2lxw436lw2brl4jf"; libraryHaskellDepends = [ base bimap bv-sized containers copilot-core copilot-prettyprinter data-default directory libBF mtl panic parameterized-utils parsec @@ -77524,8 +77587,8 @@ self: { }: mkDerivation { pname = "deep-transformations"; - version = "0.2"; - sha256 = "1kk7h4vys9l0456kaapdg1y1d8lzfkzkb71mc996l2lmrdxvzz5v"; + version = "0.2.1"; + sha256 = "0k17v0h5nll73rs03qn5b7lblarzrhmlhk44kx0ipzh4kra55500"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base generic-lens rank2classes template-haskell transformers @@ -78192,8 +78255,8 @@ self: { }: mkDerivation { pname = "dep-t"; - version = "0.6.4.0"; - sha256 = "1xrazkn8pdzkjrcia9ndxiva483w9fyclcq562assnv9j3svi145"; + version = "0.6.5.0"; + sha256 = "19jhxcmh6qf3nhixjjp7sqcpn4jpl6cdnaccvfn8375h83v1dbp9"; libraryHaskellDepends = [ base mtl transformers unliftio-core ]; testHaskellDepends = [ aeson barbies base bytestring containers doctest mtl rank2classes @@ -78825,6 +78888,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "deriving-aeson_0_2_9" = callPackage + ({ mkDerivation, aeson, base, bytestring }: + mkDerivation { + pname = "deriving-aeson"; + version = "0.2.9"; + sha256 = "0cqq4ri9dgqkdh9wybf3wf5zxb9nihql591bk1lacnzdyxfrgcn0"; + libraryHaskellDepends = [ aeson base ]; + testHaskellDepends = [ aeson base bytestring ]; + description = "Type driven generic aeson instance customisation"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "deriving-compat" = callPackage ({ mkDerivation, base, base-compat, base-orphans, containers , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged @@ -106043,6 +106119,21 @@ self: { broken = true; }) {}; + "gambler" = callPackage + ({ mkDerivation, base, criterion, hspec }: + mkDerivation { + pname = "gambler"; + version = "0.0.0.0"; + sha256 = "1bbnczw8771jv0ds082r3babf28214p99lx0f97y4hxcsi29f096"; + revision = "1"; + editedCabalFile = "12wkc92pdpiks8mn375n2yjkjq9b1n0q6vnyyslf0b58p9b9flgw"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "Composable, streaming, and efficient left folds"; + license = lib.licenses.bsd3; + }) {}; + "game-of-life" = callPackage ({ mkDerivation, array, base, hscurses, hspec, random, text }: mkDerivation { @@ -109784,12 +109875,12 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-exactprint_1_6_1" = callPackage + "ghc-exactprint_1_6_1_1" = callPackage ({ mkDerivation }: mkDerivation { pname = "ghc-exactprint"; - version = "1.6.1"; - sha256 = "1ihr3mffcm0z4plkgysiki5l225ayrxgjfjqx37ysqgp7vvnsr08"; + version = "1.6.1.1"; + sha256 = "0dzl5nhiwi6a5jq226qjq0vlb70iq50hk0kv0h675j4pr93v50w8"; isLibrary = true; isExecutable = true; description = "ExactPrint for GHC"; @@ -115295,20 +115386,15 @@ self: { }) {}; "glpk-headers" = callPackage - ({ mkDerivation, base, derive-storable, glpk, tasty, tasty-discover - , tasty-hunit - }: + ({ mkDerivation, base, derive-storable, glpk, hspec }: mkDerivation { pname = "glpk-headers"; - version = "0.4.1"; - sha256 = "1r77p0h9iyffl903ag008cb3v21jw021129cfxpr2mp1mgnkhdjd"; + version = "0.5.0"; + sha256 = "1v9wq6y4qa6m5l6z27rwgjk0s7q8gklq05djmqspm6c456f1z2q5"; libraryHaskellDepends = [ base derive-storable ]; - testHaskellDepends = [ - base derive-storable tasty tasty-discover tasty-hunit - ]; - testSystemDepends = [ glpk ]; - testToolDepends = [ tasty-discover ]; - description = "Low-level Haskell bindings to GLPK"; + librarySystemDepends = [ glpk ]; + testHaskellDepends = [ base hspec ]; + description = "Low-level Haskell bindings to the GLPK library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; @@ -135008,6 +135094,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "hedgehog-extras" = callPackage + ({ mkDerivation, aeson, aeson-pretty, async, base, bytestring + , deepseq, directory, exceptions, filepath, hedgehog, hw-aeson + , mmorph, mtl, network, process, resourcet, stm, temporary, text + , time, transformers, unliftio, unordered-containers, yaml + }: + mkDerivation { + pname = "hedgehog-extras"; + version = "0.3.0.2"; + sha256 = "1bf6fyvp2vzvm7z9ny1pcnaqqxqh9j42x6jyd2r8mv3dxdfdjkhr"; + libraryHaskellDepends = [ + aeson aeson-pretty async base bytestring deepseq directory + exceptions filepath hedgehog hw-aeson mmorph mtl network process + resourcet stm temporary text time transformers unliftio + unordered-containers yaml + ]; + description = "Supplemental library for hedgehog"; + license = lib.licenses.asl20; + }) {}; + "hedgehog-fakedata" = callPackage ({ mkDerivation, base, containers, fakedata, hedgehog, random }: mkDerivation { @@ -149328,14 +149434,14 @@ self: { license = lib.licenses.mit; }) {}; - "hslua-module-text_1_0_3" = callPackage + "hslua-module-text_1_0_3_1" = callPackage ({ mkDerivation, base, hslua-core, hslua-marshalling , hslua-packaging, tasty, tasty-hunit, tasty-lua, text }: mkDerivation { pname = "hslua-module-text"; - version = "1.0.3"; - sha256 = "0gbdsld1f1qwkb311ll7c9mrvnjf7mfqfcgc9n3cnc8l5264s6kv"; + version = "1.0.3.1"; + sha256 = "025n8vmaq22bl1x60hpg57ih44g6z71jc1qnlxfsi06hram1wcqc"; libraryHaskellDepends = [ base hslua-core hslua-marshalling hslua-packaging text ]; @@ -152609,6 +152715,8 @@ self: { pname = "http-client"; version = "0.7.13.1"; sha256 = "09qfmakjk285jz2rnb53c1m9c764fg8vngfq43ipga1g72h8d3n9"; + revision = "1"; + editedCabalFile = "168nbb80kcxyz59sz4mnaydpag5flq32y9ikfxa1jygj8j8p9034"; libraryHaskellDepends = [ array async base base64-bytestring blaze-builder bytestring case-insensitive containers cookie deepseq exceptions filepath @@ -196845,8 +196953,8 @@ self: { }: mkDerivation { pname = "mu-graphql"; - version = "0.5.0.3"; - sha256 = "1ahi51sslxlmv4yi6518bn3i4ks7hpc8327r6lz0l6d4q192k1nq"; + version = "0.5.0.4"; + sha256 = "0xazfpl6xy6j67a4mjgp09akyvlfi2r26b193d8p9rra1hn09334"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -197409,13 +197517,13 @@ self: { }) {}; "multicurryable" = callPackage - ({ mkDerivation, base, sop-core }: + ({ mkDerivation, base, doctest, sop-core }: mkDerivation { pname = "multicurryable"; - version = "0.1.0.0"; - sha256 = "0p0wlz44scvkxzdhd059ivrhz4bsgbml26a8fm7jsav80cwbdfc4"; + version = "0.1.0.1"; + sha256 = "1d75pksld6cd9p39avjq54qcb0lhjgm8b78hl1521df17c1yi5y6"; libraryHaskellDepends = [ base sop-core ]; - testHaskellDepends = [ base sop-core ]; + testHaskellDepends = [ base doctest sop-core ]; description = "Uncurry functions with multiple arguments"; license = lib.licenses.bsd3; }) {}; @@ -200881,6 +200989,40 @@ self: { license = lib.licenses.bsd3; }) {}; + "net-mqtt_0_8_2_5" = callPackage + ({ mkDerivation, async, attoparsec, attoparsec-binary, base, binary + , bytestring, checkers, conduit, conduit-extra, connection + , containers, deepseq, HUnit, network-conduit-tls, network-uri + , optparse-applicative, QuickCheck, stm, tasty, tasty-hunit + , tasty-quickcheck, text, websockets + }: + mkDerivation { + pname = "net-mqtt"; + version = "0.8.2.5"; + sha256 = "0k6yghgj693hbyk2zsjh3ns1yx9ypjjfj3mrrandn6lvpif08h9x"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async attoparsec attoparsec-binary base binary bytestring conduit + conduit-extra connection containers deepseq network-conduit-tls + network-uri QuickCheck stm text websockets + ]; + executableHaskellDepends = [ + async attoparsec attoparsec-binary base binary bytestring conduit + conduit-extra connection containers deepseq network-conduit-tls + network-uri optparse-applicative QuickCheck stm text websockets + ]; + testHaskellDepends = [ + async attoparsec attoparsec-binary base binary bytestring checkers + conduit conduit-extra connection containers deepseq HUnit + network-conduit-tls network-uri QuickCheck stm tasty tasty-hunit + tasty-quickcheck text websockets + ]; + description = "An MQTT Protocol Implementation"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "net-mqtt-lens" = callPackage ({ mkDerivation, base, HUnit, lens, net-mqtt, tasty, tasty-hunit , tasty-quickcheck @@ -238539,11 +238681,9 @@ self: { }: mkDerivation { pname = "redis-glob"; - version = "0.1.0.3"; - sha256 = "11cq30hl284cqgbsy5n4nn9aq7y84cca4skkv0ib9b6ddn97gbkf"; - libraryHaskellDepends = [ - ascii-char ascii-superset base bytestring megaparsec - ]; + version = "0.1.0.4"; + sha256 = "0w1w76ldiaxk4irgazm6xv5s60zvyyvjfsxbpa3b0aq4jgw49gh5"; + libraryHaskellDepends = [ ascii-char base bytestring megaparsec ]; testHaskellDepends = [ ascii-char ascii-superset base bytestring hspec QuickCheck ]; @@ -248606,6 +248746,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "sample-frame_0_0_4" = callPackage + ({ mkDerivation, base, QuickCheck, storable-record }: + mkDerivation { + pname = "sample-frame"; + version = "0.0.4"; + sha256 = "105hbd7s870vcjx49gk395craa4slcrngara8q3zfwn1cdpig49c"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base QuickCheck storable-record ]; + description = "Handling of samples in an (audio) signal"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "sample-frame-np" = callPackage ({ mkDerivation, base, numeric-prelude, sample-frame }: mkDerivation { @@ -248617,6 +248771,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "sample-frame-np_0_0_5" = callPackage + ({ mkDerivation, base, numeric-prelude, sample-frame }: + mkDerivation { + pname = "sample-frame-np"; + version = "0.0.5"; + sha256 = "0h02bn5zr13agpv2wg4sp6hjlid25ylny8xswrk42pzp0jsph8mn"; + libraryHaskellDepends = [ base numeric-prelude sample-frame ]; + description = "Orphan instances for types from sample-frame and numericprelude"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "sampling" = callPackage ({ mkDerivation, base, containers, criterion, foldl, mwc-random , primitive, vector @@ -265369,8 +265535,8 @@ self: { pname = "sockets-and-pipes"; version = "0.3"; sha256 = "0hlq64nh7iw7brn11j7xhy1zcmk0iczarg7ig7z2i7ny11czi73l"; - revision = "2"; - editedCabalFile = "02vwkv8qvm270rybn68yb6n7z387g1bv2iwn4pa397l94225ny7l"; + revision = "4"; + editedCabalFile = "0b7vn23r6v6s9lc2ghajbw3ci2h4wm7i07rsrwk3i4fdkp3g7dd2"; libraryHaskellDepends = [ aeson ascii async attoparsec base blaze-html bytestring containers directory filepath list-transformer network network-simple relude @@ -274644,8 +274810,8 @@ self: { ({ mkDerivation, base, generics-sop, profunctors, vector }: mkDerivation { pname = "summer"; - version = "0.3.7.1"; - sha256 = "0g745i3ms1i6qz428aln33hczvgn1zg79xd0n94h696x397d7zs5"; + version = "0.3.7.2"; + sha256 = "0dqjvq1h116x3pbmi27nlgwp6sq5w8d6clcvbw9nlb85cn6awr4y"; libraryHaskellDepends = [ base generics-sop profunctors vector ]; testHaskellDepends = [ base ]; description = "An implementation of extensible products and sums"; @@ -277392,6 +277558,39 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "synthesizer-core_0_8_3" = callPackage + ({ mkDerivation, array, base, binary, bytestring, containers + , deepseq, directory, event-list, explicit-exception, filepath + , non-empty, non-negative, numeric-prelude, numeric-quest, old-time + , process, QuickCheck, random, sample-frame-np, semigroups, sox + , storable-record, storable-tuple, storablevector, timeit + , transformers, utility-ht + }: + mkDerivation { + pname = "synthesizer-core"; + version = "0.8.3"; + sha256 = "0a12qmr7fdlz5mbrki9nd1fl07670hll3wrdpp1apvf6zd36h7mn"; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq event-list + explicit-exception filepath non-empty non-negative numeric-prelude + numeric-quest process QuickCheck random sample-frame-np semigroups + sox storable-record storable-tuple storablevector transformers + utility-ht + ]; + testHaskellDepends = [ + base containers event-list non-empty non-negative numeric-prelude + QuickCheck random storable-tuple storablevector transformers + utility-ht + ]; + benchmarkHaskellDepends = [ + array base binary bytestring directory numeric-prelude old-time + storable-tuple storablevector timeit utility-ht + ]; + description = "Audio signal processing coded in Haskell: Low level part"; + license = "GPL"; + hydraPlatforms = lib.platforms.none; + }) {}; + "synthesizer-dimensional" = callPackage ({ mkDerivation, base, bytestring, event-list, non-negative , numeric-prelude, random, semigroups, sox, storable-record @@ -277899,8 +278098,8 @@ self: { }: mkDerivation { pname = "systemd-socket-activation"; - version = "1.0.0.1"; - sha256 = "1czps42qaxghg3mbr7v847j1yqgk79lbx1b5dmi5mnyg3869dq81"; + version = "1.0.0.2"; + sha256 = "1shqkxa8wgnx3bndy3qgykb4l0jsrp4qpwahgy9r6n98a1idbx0v"; libraryHaskellDepends = [ base containers network text transformers unix ]; @@ -279558,8 +279757,8 @@ self: { }: mkDerivation { pname = "tasty-checklist"; - version = "1.0.4.1"; - sha256 = "0l281cj18m35zv52s276s8vgrwsd6plykrcs0ivb0jixy898lppk"; + version = "1.0.5.0"; + sha256 = "0661qpzdb9bdjd7k0j6lhfgnmkdcf3xjv66q6lfcvsdw2nvvp48n"; libraryHaskellDepends = [ base exceptions parameterized-utils text ]; @@ -289799,14 +289998,12 @@ self: { mainProgram = "Benchmark"; }) {}; - "transformers_0_6_0_4" = callPackage + "transformers_0_6_0_5" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "transformers"; - version = "0.6.0.4"; - sha256 = "1jw9c89yri37hsai6jgckfdana1gqjr15xnanxzm3vahvgcb5f1s"; - revision = "1"; - editedCabalFile = "0j369jl6y2p3gyhhxyr24x7dbdgvlgnnfxjb63f9gkb9b11rbq3q"; + version = "0.6.0.5"; + sha256 = "09s4svr1z1y93qwzq22py0s2s35b6lyszyfippiimccqrbk1jlsm"; libraryHaskellDepends = [ base ]; description = "Concrete functor and monad transformers"; license = lib.licenses.bsd3; @@ -301414,8 +301611,8 @@ self: { }: mkDerivation { pname = "verset"; - version = "0.0.1.7"; - sha256 = "12bbadznnp4pksy1yb7lw4zniksnaz7ipmfyji0ak6b0bqfh74s2"; + version = "0.0.1.8"; + sha256 = "19l5ck1l1528f7mqks5c6n314cyzrw5qk2ddg77s6y6lv5sm4kv3"; libraryHaskellDepends = [ base bytestring containers extra mtl safe text time uuid ]; @@ -309564,8 +309761,8 @@ self: { }: mkDerivation { pname = "wstunnel"; - version = "0.5.0.0"; - sha256 = "0qm6n009p9lyb5iy5rbrlwvcfcqdnlpxvc5cy02f3xyf9h8ikwkp"; + version = "0.5.1.0"; + sha256 = "10iac65sg2h6azj99gpz8p9hxs38sf675mq1f83rrjvc5zanhm2c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -310136,8 +310333,8 @@ self: { ({ mkDerivation, base, containers, mtl, pretty, xml }: mkDerivation { pname = "xcb-types"; - version = "0.11.0"; - sha256 = "1yhf1gh23ccvhkx8xbmiaa24r1mrilyvq3fwa15h8imf7qfvmr6x"; + version = "0.12.0"; + sha256 = "0w3q0qclpjdy51jdd761ykz48l5sm3q6jjy8igaf3yhsdzzg79fw"; libraryHaskellDepends = [ base containers mtl pretty xml ]; description = "Parses XML files used by the XCB project"; license = lib.licenses.bsd3; From 4e75bbe7688df4a3ff4dd3ed02033e5f5e6d54e3 Mon Sep 17 00:00:00 2001 From: maralorn Date: Sun, 8 Jan 2023 19:34:35 +0100 Subject: [PATCH 032/163] haskell.packages.ghc94.haskell-language-server: Fix eval --- pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index 2b704463d62e..b65479335393 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -181,7 +181,7 @@ in { ghc-exactprint = overrideCabal (drv: { libraryHaskellDepends = with self; [ HUnit data-default fail filemanip free ghc-paths ordered-containers silently syb Diff ]; }) - self.ghc-exactprint_1_6_1; + self.ghc-exactprint_1_6_1_1; # 2022-10-06: plugins disabled for hls 1.8.0.0 based on # https://haskell-language-server.readthedocs.io/en/latest/support/plugin-support.html#current-plugin-support-tiers From 43af53bc7f49b3c542604ddae08cbdb61a276c2b Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 8 Jan 2023 19:49:24 +0100 Subject: [PATCH 033/163] haskellPackages.wstunnel: drop now unnecessary override --- pkgs/development/haskell-modules/configuration-common.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5af3c76a9e3f..8792d5d26882 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2095,10 +2095,6 @@ self: super: { # https://github.com/zellige/hs-geojson/issues/29 geojson = dontCheck super.geojson; - # Test suite doesn't compile - # https://github.com/erebe/wstunnel/issues/145 - wstunnel = dontCheck super.wstunnel; - # Test data missing from sdist # https://github.com/ngless-toolkit/ngless/issues/152 NGLess = dontCheck super.NGLess; From 983e50113c9de1fe5a14fc55225f32c2d6f1c01e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Jan 2023 04:01:42 +0000 Subject: [PATCH 034/163] bind: 9.18.9 -> 9.18.10 --- pkgs/servers/dns/bind/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 0d38dcbf02d5..7a7a6de5dad4 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "bind"; - version = "9.18.9"; + version = "9.18.10"; src = fetchurl { url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-apZlmY1WhgRGDfCRj8jM+tfSk4jU2EJWDAVswhHLskM="; + sha256 = "sha256-9BWpL+tiVotQhUoGPLIx4lc1H4ZyGG0KsDGkmz3iysY="; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; From a8202b81107630b05df59b8725830dbd40e04338 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Jan 2023 05:08:32 +0000 Subject: [PATCH 035/163] graphicsmagick: 1.3.38 -> 1.3.39 --- pkgs/applications/graphics/graphicsmagick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index d9b6db8d653d..55e57ac01e4c 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "graphicsmagick"; - version = "1.3.38"; + version = "1.3.39"; src = fetchurl { url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz"; - sha256 = "sha256-1gzZ21k1HSucsZvrRDFwrKoo8HPRPSWPZ7NidjXjJnU="; + sha256 = "sha256-4wscpY6HPQoe4gg4RyRCTbLTwzpUA04mHRTo+7j40E8="; }; patches = [ From 99d50204936d47f9e94a927e52e1027bfcc98cde Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Jan 2023 15:26:52 +0000 Subject: [PATCH 036/163] python310Packages.launchpadlib: 1.10.18 -> 1.11.0 --- pkgs/development/python-modules/launchpadlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/launchpadlib/default.nix b/pkgs/development/python-modules/launchpadlib/default.nix index 10f7405a268a..f6e0ba20be23 100644 --- a/pkgs/development/python-modules/launchpadlib/default.nix +++ b/pkgs/development/python-modules/launchpadlib/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "launchpadlib"; - version = "1.10.18"; + version = "1.11.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-uFRv4XrKUUfSRq0gd4xKVUTrR6+RsYUVJDePpo8tcmQ="; + sha256 = "sha256-AYmMk3R3sMZKdTOK2wl3Ao1zRqigGesCPPaP7ZmFAUY="; }; propagatedBuildInputs = [ From a8fa46a964af409c0bad72dd87d9777d07ca22b1 Mon Sep 17 00:00:00 2001 From: maralorn Date: Tue, 10 Jan 2023 00:34:51 +0100 Subject: [PATCH 037/163] maintainers/../haskell/mark-broken: Insert eval info in commit msg --- maintainers/scripts/haskell/hydra-report.hs | 45 ++++++++++++--------- maintainers/scripts/haskell/mark-broken.sh | 5 ++- 2 files changed, 29 insertions(+), 21 deletions(-) diff --git a/maintainers/scripts/haskell/hydra-report.hs b/maintainers/scripts/haskell/hydra-report.hs index f5e8da1b3f4d..f86f0fbc6a2d 100755 --- a/maintainers/scripts/haskell/hydra-report.hs +++ b/maintainers/scripts/haskell/hydra-report.hs @@ -112,7 +112,8 @@ main = do ["get-report"] -> getBuildReports ["ping-maintainers"] -> printMaintainerPing ["mark-broken-list"] -> printMarkBrokenList - _ -> putStrLn "Usage: get-report | ping-maintainers | mark-broken-list" + ["eval-info"] -> printEvalInfo + _ -> putStrLn "Usage: get-report | ping-maintainers | mark-broken-list | eval-info" reportFileName :: IO FilePath reportFileName = getXdgDirectory XdgCache "haskell-updates-build-report.json" @@ -396,12 +397,22 @@ jobTotals (summaryBuilds -> Table mapping) = getSum <$> Table (Map.foldMapWithKe details :: Text -> [Text] -> [Text] details summary content = ["
" <> summary <> " ", ""] <> content <> ["
", ""] +evalLine :: Eval -> UTCTime -> Text +evalLine Eval{id, jobsetevalinputs = JobsetEvalInputs{nixpkgs = Nixpkgs{revision}}} fetchTime = + "*evaluation [" + <> showT id + <> "](https://hydra.nixos.org/eval/" + <> showT id + <> ") of nixpkgs commit [" + <> Text.take 7 revision + <> "](https://github.com/NixOS/nixpkgs/commits/" + <> revision + <> ") as of " + <> Text.pack (formatTime defaultTimeLocale "%Y-%m-%d %H:%M UTC" fetchTime) + <> "*" + printBuildSummary :: Eval -> UTCTime -> StatusSummary -> [(Text, Int)] -> Text -printBuildSummary - Eval{id, jobsetevalinputs = JobsetEvalInputs{nixpkgs = Nixpkgs{revision}}} - fetchTime - summary - topBrokenRdeps = +printBuildSummary eval@Eval{id} fetchTime summary topBrokenRdeps = Text.unlines $ headline <> [""] <> tldr <> ((" * "<>) <$> (errors <> warnings)) <> [""] <> totals @@ -416,25 +427,14 @@ printBuildSummary <> footer where footer = ["*Report generated with [maintainers/scripts/haskell/hydra-report.hs](https://github.com/NixOS/nixpkgs/blob/haskell-updates/maintainers/scripts/haskell/hydra-report.hs)*"] + headline = + [ "### [haskell-updates build report from hydra](https://hydra.nixos.org/jobset/nixpkgs/haskell-updates)" + , evalLine eval fetchTime ] totals = [ "#### Build summary" , "" ] <> printTable "Platform" (\x -> makeSearchLink id (platform x <> " " <> platformIcon x) ("." <> platform x)) (\x -> showT x <> " " <> icon x) showT numSummary - headline = - [ "### [haskell-updates build report from hydra](https://hydra.nixos.org/jobset/nixpkgs/haskell-updates)" - , "*evaluation [" - <> showT id - <> "](https://hydra.nixos.org/eval/" - <> showT id - <> ") of nixpkgs commit [" - <> Text.take 7 revision - <> "](https://github.com/NixOS/nixpkgs/commits/" - <> revision - <> ") as of " - <> Text.pack (formatTime defaultTimeLocale "%Y-%m-%d %H:%M UTC" fetchTime) - <> "*" - ] brokenLine (name, rdeps) = "[" <> name <> "](https://packdeps.haskellers.com/reverse/" <> name <> ") :arrow_heading_up: " <> Text.pack (show rdeps) <> " " numSummary = statusToNumSummary summary jobsByState predicate = Map.filter (predicate . worstState) summary @@ -469,6 +469,11 @@ printBuildSummary maintainedJob = Map.lookup "maintained" summary mergeableJob = Map.lookup "mergeable" summary +printEvalInfo :: IO () +printEvalInfo = do + (eval, fetchTime, _) <- readBuildReports + putStrLn (Text.unpack $ evalLine eval fetchTime) + printMaintainerPing :: IO () printMaintainerPing = do (maintainerMap, (reverseDependencyMap, topBrokenRdeps)) <- concurrently getMaintainerMap do diff --git a/maintainers/scripts/haskell/mark-broken.sh b/maintainers/scripts/haskell/mark-broken.sh index 97dd5be8aaa6..2111ef52bc05 100755 --- a/maintainers/scripts/haskell/mark-broken.sh +++ b/maintainers/scripts/haskell/mark-broken.sh @@ -34,6 +34,7 @@ clear="env -u HOME -u NIXPKGS_CONFIG" $clear maintainers/scripts/haskell/regenerate-hackage-packages.sh $clear maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh $clear maintainers/scripts/haskell/regenerate-hackage-packages.sh +evalline=$(maintainers/scripts/haskell/hydra-report.hs eval-info) if [[ "${1:-}" == "--do-commit" ]]; then git add $broken_config @@ -42,6 +43,8 @@ git add pkgs/development/haskell-modules/hackage-packages.nix git commit -F - << EOF haskellPackages: mark builds failing on hydra as broken -This commit has been generated by maintainers/scripts/haskell/mark-broken.sh +This commit has been generated by maintainers/scripts/haskell/mark-broken.sh based on +$evalline +from the haskell-updates jobset on hydra under https://hydra.nixos.org/jobset/nixpkgs/haskell-updates EOF fi From d4d8f9e01840190e7e016fb84793bdd19aaba3be Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Jan 2023 01:28:38 +0000 Subject: [PATCH 038/163] apkeep: 0.14.1 -> 0.15.0 --- pkgs/tools/misc/apkeep/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/apkeep/default.nix b/pkgs/tools/misc/apkeep/default.nix index 2165390744c4..62300afbdb0a 100644 --- a/pkgs/tools/misc/apkeep/default.nix +++ b/pkgs/tools/misc/apkeep/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "apkeep"; - version = "0.14.1"; + version = "0.15.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-ikI178fExFHYapg95NKtMxKT/4mXfVH+Jvaw8i1pSu4="; + sha256 = "sha256-PikUb9D9duMATo9hJgjuZUK3WXUKfnCDWJBE/bJI92c="; }; - cargoSha256 = "sha256-hA/GIj5MunflLlwa0S4o4EEr6Us+34dgYAAc43C6EXo="; + cargoHash = "sha256-R58CzeI1Xho6kzjb9ktO7sr6TgM3Hf2VU0pK4hmb1v4="; prePatch = '' rm .cargo/config.toml From 404ef069ce8c9450e70ec28315cc074015db1496 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Jan 2023 02:47:13 +0000 Subject: [PATCH 039/163] julia_18: 1.8.4 -> 1.8.5 --- pkgs/development/compilers/julia/1.8.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/julia/1.8.nix b/pkgs/development/compilers/julia/1.8.nix index 83e87bf4c2f2..1a6d6e7332c1 100644 --- a/pkgs/development/compilers/julia/1.8.nix +++ b/pkgs/development/compilers/julia/1.8.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "julia"; - version = "1.8.4"; + version = "1.8.5"; src = fetchurl { url = "https://github.com/JuliaLang/julia/releases/download/v${version}/julia-${version}-full.tar.gz"; - hash = "sha256-HNAyJixcQgSKeBm8zWhOhDu7j2bPn/VsMViB6kMfADM="; + hash = "sha256-NVVAgKS0085S7yICVDBr1CrA2I7/nrhVkqV9BmPbXfI="; }; patches = [ From d4dd76f46cafca7f5bf7036e72f4c4daf6542733 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Jan 2023 08:53:34 +0100 Subject: [PATCH 040/163] apkeep: add changelog to meta --- pkgs/tools/misc/apkeep/default.nix | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/apkeep/default.nix b/pkgs/tools/misc/apkeep/default.nix index 62300afbdb0a..c1bca0969077 100644 --- a/pkgs/tools/misc/apkeep/default.nix +++ b/pkgs/tools/misc/apkeep/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchCrate, rustPlatform, openssl, pkg-config, Security }: +{ lib +, stdenv +, fetchCrate +, rustPlatform +, openssl +, pkg-config +, Security +}: rustPlatform.buildRustPackage rec { pname = "apkeep"; @@ -6,7 +13,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-PikUb9D9duMATo9hJgjuZUK3WXUKfnCDWJBE/bJI92c="; + hash = "sha256-PikUb9D9duMATo9hJgjuZUK3WXUKfnCDWJBE/bJI92c="; }; cargoHash = "sha256-R58CzeI1Xho6kzjb9ktO7sr6TgM3Hf2VU0pK4hmb1v4="; @@ -15,13 +22,20 @@ rustPlatform.buildRustPackage rec { rm .cargo/config.toml ''; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + Security + ]; meta = with lib; { description = "A command-line tool for downloading APK files from various sources"; homepage = "https://github.com/EFForg/apkeep"; + changelog = "https://github.com/EFForg/apkeep/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ jyooru ]; }; From 828d44af008c18d615d268614a45f6ccafea2881 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Jan 2023 09:15:02 +0000 Subject: [PATCH 041/163] utf8cpp: 3.2.2 -> 3.2.3 --- pkgs/development/libraries/utf8cpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/utf8cpp/default.nix b/pkgs/development/libraries/utf8cpp/default.nix index 4e0130fe07f4..147248ee3461 100644 --- a/pkgs/development/libraries/utf8cpp/default.nix +++ b/pkgs/development/libraries/utf8cpp/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "utf8cpp"; - version = "3.2.2"; + version = "3.2.3"; src = fetchFromGitHub { owner = "nemtrif"; repo = "utfcpp"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-L58OMNrKd1+yco0V/jpOfWgDr0K1y8jOJ3TasUMRw0k="; + sha256 = "sha256-PnHbbjsryRwMMu517ta18qNgwOM6hRnVmXmR3fzS1+4="; }; cmakeFlags = [ From 4a15f0b45d2d9beaf6ebb8c23333d167f2f0d2f0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Jan 2023 11:25:48 +0000 Subject: [PATCH 042/163] namecoin: 23.0 -> 24.0 --- pkgs/applications/blockchains/namecoin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/namecoin/default.nix b/pkgs/applications/blockchains/namecoin/default.nix index a42e474c258a..ffa9a5d3c226 100644 --- a/pkgs/applications/blockchains/namecoin/default.nix +++ b/pkgs/applications/blockchains/namecoin/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "namecoin" + lib.optionalString (!withGui) "d"; - version = "23.0"; + version = "24.0"; src = fetchFromGitHub { owner = "namecoin"; repo = "namecoin-core"; rev = "nc${version}"; - sha256 = "sha256-MfqJ7EcJvlQ01Mr1RQpXVNUlGIwNqFTxrVwGa+Hus+A="; + sha256 = "sha256-DSUYqNHgPsHVwx3G83pZdzsTjhX2X2mMqt+lAlIuGp0="; }; nativeBuildInputs = [ From 04acdfd75e872a2c3c2a3e11d46a7bd884ef3929 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Jan 2023 12:39:59 +0000 Subject: [PATCH 043/163] stress-ng: 0.14.06 -> 0.15.01 --- pkgs/tools/system/stress-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index 8cc5d9599cc1..aa9ffa6f391a 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "stress-ng"; - version = "0.14.06"; + version = "0.15.01"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = pname; rev = "V${version}"; - hash = "sha256-akWvX22oJT/V5Zvsk7AXXIFK1AjfWEzMZXAwpJCc0M0="; + hash = "sha256-reHO426jUI0/jGhVFfurQ5dsRol4e9YlcE7p7nZyBCU="; }; postPatch = '' From 58bc9d9e7d0121d5ec1f6da0f0af0f6c636caff0 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Tue, 10 Jan 2023 14:41:03 +0100 Subject: [PATCH 044/163] namecoin: remove infinisil as a maintainer Haven't used namecoin in years and don't intend to ever use it again :) --- pkgs/applications/blockchains/namecoin/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/blockchains/namecoin/default.nix b/pkgs/applications/blockchains/namecoin/default.nix index ffa9a5d3c226..e2f2d57fc829 100644 --- a/pkgs/applications/blockchains/namecoin/default.nix +++ b/pkgs/applications/blockchains/namecoin/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { description = "Decentralized open source information registration and transfer system based on the Bitcoin cryptocurrency"; homepage = "https://namecoin.org"; license = licenses.mit; - maintainers = with maintainers; [ infinisil ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } From 81133a2d7efd18b8384d6f34c6d6e3653aa80571 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 10 Jan 2023 16:32:33 +0100 Subject: [PATCH 045/163] python3Packages.eigenpy: 2.8.1 -> 2.9.0 --- pkgs/development/python-modules/eigenpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/eigenpy/default.nix b/pkgs/development/python-modules/eigenpy/default.nix index a13b8e52ed53..c03b167d4e37 100644 --- a/pkgs/development/python-modules/eigenpy/default.nix +++ b/pkgs/development/python-modules/eigenpy/default.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "eigenpy"; - version = "2.8.1"; + version = "2.9.0"; src = fetchFromGitHub { owner = "stack-of-tasks"; repo = pname; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-nofB5TDvEArhPcYe/Pb1LQBC+W6MrE3NuapaZmKIO68="; + sha256 = "sha256-gYGJutTnvq5ERv6tDff6b+t7Kitnx9QAD/6hauHxOt4="; }; strictDeps = true; From 28ea2c96c352429e0f1c6720ebaed70dd6428672 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Jan 2023 16:15:58 +0000 Subject: [PATCH 046/163] prometheus-nut-exporter: 2.5.1 -> 2.5.2 --- pkgs/servers/monitoring/prometheus/nut-exporter.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/nut-exporter.nix b/pkgs/servers/monitoring/prometheus/nut-exporter.nix index 995c52b10fcb..d05afd220533 100644 --- a/pkgs/servers/monitoring/prometheus/nut-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nut-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nut-exporter"; - version = "2.5.1"; + version = "2.5.2"; src = fetchFromGitHub { owner = "DRuggeri"; repo = "nut_exporter"; rev = "v${version}"; - sha256 = "sha256-pXC4DkuMyvNG8w/p5ku8hi6MhbF85PzVpFz+IExT9NU="; + sha256 = "sha256-imO++i4bfxQnMNh+BOZRYvJAzqgehFIElpQX3NyQF+8="; }; - vendorSha256 = "sha256-ji8JlEYChPBakt5y6+zcm1l04VzZ0/fjfGFJ9p+1KHE="; + vendorHash = "sha256-ji8JlEYChPBakt5y6+zcm1l04VzZ0/fjfGFJ9p+1KHE="; meta = with lib; { description = "Prometheus exporter for Network UPS Tools"; From 0e96ec7047eff3282fb5904bb82ead460e5d1fd9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Jan 2023 17:58:22 +0100 Subject: [PATCH 047/163] python310Packages.eigenpy: add changelog to meta --- pkgs/development/python-modules/eigenpy/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/eigenpy/default.nix b/pkgs/development/python-modules/eigenpy/default.nix index c03b167d4e37..4f070068a12d 100644 --- a/pkgs/development/python-modules/eigenpy/default.nix +++ b/pkgs/development/python-modules/eigenpy/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { repo = pname; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-gYGJutTnvq5ERv6tDff6b+t7Kitnx9QAD/6hauHxOt4="; + hash = "sha256-gYGJutTnvq5ERv6tDff6b+t7Kitnx9QAD/6hauHxOt4="; }; strictDeps = true; @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Bindings between Numpy and Eigen using Boost.Python"; homepage = "https://github.com/stack-of-tasks/eigenpy"; + changelog = "https://github.com/stack-of-tasks/eigenpy/releases/tag/v${version}"; license = licenses.bsd2; maintainers = with maintainers; [ wegank ]; platforms = platforms.unix; From d792f00a19e7f4dfae73803b602dc2d35e8bb102 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 10 Jan 2023 09:30:17 -0800 Subject: [PATCH 048/163] python310Packages.gitpython: 3.1.29 -> 3.1.30 fixes CVE-2022-24439 https://github.com/gitpython-developers/GitPython/releases/tag/3.1.30 --- pkgs/development/python-modules/gitpython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gitpython/default.nix b/pkgs/development/python-modules/gitpython/default.nix index e577a1e508a4..e5a98bb27d22 100644 --- a/pkgs/development/python-modules/gitpython/default.nix +++ b/pkgs/development/python-modules/gitpython/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "gitpython"; - version = "3.1.29"; + version = "3.1.30"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "gitpython-developers"; repo = "GitPython"; rev = version; - hash = "sha256-RNDBoGWnkirPZjxn5oqH3zwYqVFLedNrSRpZOHU0j+w="; + hash = "sha256-odtYBQLscncdC+NbDC9D84QQveDoimkQ6RzUQLJgizI="; }; propagatedBuildInputs = [ From e4c9245ea7963adc670f1b61d041d38be3e13e06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Ker=C3=A4nen?= Date: Tue, 10 Jan 2023 21:07:29 +0200 Subject: [PATCH 049/163] maintainers: add Detegr --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 513ddab457eb..9c3eda660e93 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -16259,4 +16259,10 @@ github = "ziguana"; githubId = 45833444; }; + detegr = { + name = "Antti Keränen"; + email = "detegr@rbx.email"; + github = "Detegr"; + githubId = 724433; + }; } From aa1620e124d72cae78ff33807654a32f207da2c8 Mon Sep 17 00:00:00 2001 From: kilianar Date: Tue, 10 Jan 2023 22:13:24 +0100 Subject: [PATCH 050/163] calibre: 6.10.0 -> 6.11.0 https://github.com/kovidgoyal/calibre/releases/tag/v6.11.0 --- pkgs/applications/misc/calibre/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index f9a1faaf036d..acfe1d9284e5 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -31,11 +31,11 @@ stdenv.mkDerivation rec { pname = "calibre"; - version = "6.10.0"; + version = "6.11.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz"; - hash = "sha256-JE5AnaCMfe9mI+qLe1LdbbHAdC5X5wLo/zFhcJLLAhk="; + hash = "sha256-ylOZ5ljA5uBb2bX/qFhsmPQW6dJVEH9jxQaR2u8C4Wc="; }; # https://sources.debian.org/patches/calibre/${version}+dfsg-1 @@ -47,8 +47,8 @@ stdenv.mkDerivation rec { hash = "sha256-uL1mSjgCl5ZRLbSuKxJM6XTfvVwog70F7vgKtQzQNEQ="; }) (fetchpatch { - name = "0006-Hardening-Qt-code.patch"; - url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${version}%2Bdfsg-1/debian/patches/0006-Hardening-Qt-code.patch"; + name = "0007-Hardening-Qt-code.patch"; + url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${version}%2Bdfsg-1/debian/patches/0007-Hardening-Qt-code.patch"; hash = "sha256-CutVTb7K4tjewq1xAjHEGUHFcuuP/Z4FFtj4xQb4zKQ="; }) ] @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { xdg-utils ] ++ ( with python3Packages; [ - (apsw.overrideAttrs (oldAttrs: rec { + (apsw.overrideAttrs (oldAttrs: { setupPyBuildFlags = [ "--enable=load_extension" ]; })) beautifulsoup4 From c9e560430fe43e57ee592e712238c59cbcde5f99 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Jan 2023 23:16:48 +0000 Subject: [PATCH 051/163] mdbook-katex: 0.2.21 -> 0.3.0 --- pkgs/tools/text/mdbook-katex/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/mdbook-katex/default.nix b/pkgs/tools/text/mdbook-katex/default.nix index c269287ff8db..9a8e9d7c75e3 100644 --- a/pkgs/tools/text/mdbook-katex/default.nix +++ b/pkgs/tools/text/mdbook-katex/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-katex"; - version = "0.2.21"; + version = "0.3.0"; src = fetchCrate { inherit pname version; - hash = "sha256-cJRO/HHxujSL5YTM4e+HMRsItlEe1OYn8rSqnwcqbgU="; + hash = "sha256-s3ZR1fQ5x6FiHzoiDCqZahQCjhtuOoeDM32w/16DEmk="; }; - cargoHash = "sha256-FPoSye+wD/MPR5fCrQ212W4iYoJLWOFXgeStcg0GEHw="; + cargoHash = "sha256-/fO+ozw6dg8TeIYQ3R7LWT+acDToNcGFvceV8YojVCw="; OPENSSL_DIR = "${lib.getDev openssl}"; OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib"; From 63f5006d0f1cba6c5263b3eae03a1c8be2407ec8 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 10 Jan 2023 21:44:22 -0500 Subject: [PATCH 052/163] ruff: 0.0.217 -> 0.0.218 Diff: https://github.com/charliermarsh/ruff/compare/v0.0.217...v0.0.218 Changelog: https://github.com/charliermarsh/ruff/releases/tag/v0.0.218 --- pkgs/development/tools/ruff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index 2e8ffcd1a8f8..eaa41e9e024a 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.217"; + version = "0.0.218"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/nZtq1FSOsB0OX0lVFY3o0F/1ZobM8iW+3zp4muhtfU="; + sha256 = "sha256-H3ZvtYAKF32yqsKOKolA+mqKK+BdxrKW+aWem0b/Hww="; }; - cargoSha256 = "sha256-mSDr2ywrk2cPp2NrvjaxU//+ZYQZe05XF5Ny8Bkx7uA="; + cargoSha256 = "sha256-+r3kQ9WnVyNZlae5PtZ6SZR7VWqSm+sgHItHUN9Acog="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices From f2af8bd5327073754a956edbb4a175a450ce907f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Ker=C3=A4nen?= Date: Tue, 10 Jan 2023 21:04:11 +0200 Subject: [PATCH 053/163] jfrog-cli: init at 2.32.0 --- pkgs/tools/misc/jfrog-cli/default.nix | 30 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/tools/misc/jfrog-cli/default.nix diff --git a/pkgs/tools/misc/jfrog-cli/default.nix b/pkgs/tools/misc/jfrog-cli/default.nix new file mode 100644 index 000000000000..7a8a6aa8a848 --- /dev/null +++ b/pkgs/tools/misc/jfrog-cli/default.nix @@ -0,0 +1,30 @@ +{ buildGoModule, fetchFromGitHub, pkgs, lib }: + +buildGoModule rec { + pname = "jfrog-cli"; + version = "2.32.0"; + vendorSha256 = "sha256-nL+2Yc4gI2+SoxoaGlazecsrcVkVh6Ig9sqITSOa5e0="; + + src = fetchFromGitHub { + owner = "jfrog"; + repo = "jfrog-cli"; + rev = "v${version}"; + sha256 = "sha256-EyDX4OrBAzc5eYR660SrGIG61TRlWnnV/GAtXy7DfEI="; + }; + + postInstall = '' + # Name the output the same way as the original build script does + mv $out/bin/jfrog-cli $out/bin/jf + ''; + + # Some of the tests require a writable $HOME + preCheck = "export HOME=$TMPDIR"; + + meta = with lib; { + homepage = "https://github.com/jfrog/jfrog-cli"; + description = "Client for accessing to JFrog's Artifactory and Mission Control through their respective REST APIs"; + license = licenses.asl20; + mainProgram = "jf"; + maintainers = [ maintainers.detegr ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f0caa502c84c..c9d71bb9423b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -38484,4 +38484,6 @@ with pkgs; alsa-scarlett-gui = callPackage ../applications/audio/alsa-scarlett-gui { }; tuner = callPackage ../applications/audio/tuner { }; + + jfrog-cli = callPackage ../tools/misc/jfrog-cli { }; } From 5aaabe9e5f70b9b5818d4d7dcbabe86d7ebe81c9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 11 Jan 2023 07:00:49 +0000 Subject: [PATCH 054/163] martian-mono: 0.9.2 -> 1.0.0 --- pkgs/data/fonts/martian-mono/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/martian-mono/default.nix b/pkgs/data/fonts/martian-mono/default.nix index 98f20082be98..ca15d938d95f 100644 --- a/pkgs/data/fonts/martian-mono/default.nix +++ b/pkgs/data/fonts/martian-mono/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "martian-mono"; - version = "0.9.2"; + version = "1.0.0"; src = fetchzip { url = "https://github.com/evilmartians/mono/releases/download/v${version}/martian-mono-${version}-otf.zip"; - sha256 = "sha256-whIR7BaEflm/VsF60Xck6ZJDLzTugaTOogHzcEtwCsM="; + sha256 = "sha256-hC08IHWqg+x3qoEf4EL98ZbGeqdwjnMpDovEiWrWPpI="; stripRoot = false; }; From 2528c4931937ba9829c4a7855eea2ed2a3c1ab4a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 11 Jan 2023 08:38:00 +0000 Subject: [PATCH 055/163] nix-eval-jobs: 2.11.0 -> 2.12.0 --- pkgs/tools/package-management/nix-eval-jobs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nix-eval-jobs/default.nix b/pkgs/tools/package-management/nix-eval-jobs/default.nix index 3028903cb948..51d70f15dfcb 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.11.0"; + version = "2.12.0"; src = fetchFromGitHub { owner = "nix-community"; repo = pname; rev = "v${version}"; - hash = "sha256-xgXYe/IJfGhLc1D9q+QdPHsjUlq10oKBbEn9AR37pn8="; + hash = "sha256-HSgW9qKXIWu+nzlWjR7HoIrjO1yn48a0U/E76VwrpQ0="; }; buildInputs = [ boost From 35a8632ee1d99808e2fbb53930f39f217d0a8406 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 11 Jan 2023 20:47:00 +0800 Subject: [PATCH 056/163] cinnamon.cinnamon-common: 5.6.5 -> 5.6.6 https://github.com/linuxmint/cinnamon/compare/5.6.5...5.6.6 --- pkgs/desktops/cinnamon/cinnamon-common/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index c0c63675cb50..6e49671f48bb 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -54,13 +54,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-common"; - version = "5.6.5"; + version = "5.6.6"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cinnamon"; rev = version; - hash = "sha256-UAPzB4Ps/w0VQjbbVl4KMRghwMc4roJR2/ZWkmwOSos="; + hash = "sha256-BRknGZOaN156fyETworGIdEiJWrf5uqFD/Nc88LcNcg="; }; patches = [ From c41e15834fa2069a98fb716eb53aeea47bd3e7f5 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 11 Jan 2023 20:51:28 +0800 Subject: [PATCH 057/163] cinnamon.xreader: 3.6.2 -> 3.6.3 https://github.com/linuxmint/xreader/compare/3.6.2...3.6.3 --- pkgs/desktops/cinnamon/xreader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/xreader/default.nix b/pkgs/desktops/cinnamon/xreader/default.nix index b03035bb0e1b..eea8ead9ac76 100644 --- a/pkgs/desktops/cinnamon/xreader/default.nix +++ b/pkgs/desktops/cinnamon/xreader/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "xreader"; - version = "3.6.2"; + version = "3.6.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-cQ8ofBTOzHD1te2lXuCgJImgK3M1/lXmnh4yL4LfYx4="; + sha256 = "sha256-KuCcOnhM8AzKC8hfBpdcnC/ubDVsElKMZuxEnTcJLn0="; }; nativeBuildInputs = [ From c96efc9d4487d56d5484482d751064588fc650d0 Mon Sep 17 00:00:00 2001 From: Joe DeVivo Date: Wed, 11 Jan 2023 07:17:38 -0700 Subject: [PATCH 058/163] maintainers: add joedevivo --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 513ddab457eb..d848c9a070d1 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6852,6 +6852,12 @@ githubId = 3967312; name = "Jocelyn Thode"; }; + joedevivo = { + email = "55951+joedevivo@users.noreply.github.com"; + github = "joedevivo"; + githubId = 55951; + name = "Joe DeVivo"; + }; joelancaster = { email = "joe.a.lancas@gmail.com"; github = "JoeLancaster"; From 288a8815e07ed5f804c9e9db581ecb5c90f97753 Mon Sep 17 00:00:00 2001 From: Joe DeVivo Date: Wed, 11 Jan 2023 07:22:06 -0700 Subject: [PATCH 059/163] zimfw: init at 1.11.0 --- pkgs/shells/zsh/zimfw/default.nix | 45 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 47 insertions(+) create mode 100644 pkgs/shells/zsh/zimfw/default.nix diff --git a/pkgs/shells/zsh/zimfw/default.nix b/pkgs/shells/zsh/zimfw/default.nix new file mode 100644 index 000000000000..f78723ee6e2b --- /dev/null +++ b/pkgs/shells/zsh/zimfw/default.nix @@ -0,0 +1,45 @@ +{ stdenv, lib, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "zimfw"; + version = "1.11.0"; + src = fetchFromGitHub { + owner = "zimfw"; + repo = "zimfw"; + rev = "v${version}"; + ## zim only needs this one file to be installed. + sparseCheckout = [ "zimfw.zsh" ]; + sha256 = "sha256-BmzYAgP5Z77VqcpAB49cQLNuvQX1qcKmAh9BuXsy2pA="; + }; + strictDeps = true; + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp -r $src/zimfw.zsh $out/ + + runHook postInstall + ''; + + ## zim automates the downloading of any plugins you specify in the `.zimrc` + ## file. To do that with Nix, you'll need $ZIM_HOME to be writable. + ## `~/.cache/zim` is a good place for that. The problem is that zim also + ## looks for `zimfw.zsh` there, so we're going to tell it here to look for + ## the `zimfw.zsh` where we currently are. + postFixup = '' + substituteInPlace $out/zimfw.zsh \ + --replace "\''${ZIM_HOME}/zimfw.zsh" "$out/zimfw.zsh" + ''; + + meta = with lib; { + description = + "The Zsh configuration framework with blazing speed and modular extensions"; + homepage = "https://zimfw.sh"; + license = licenses.mit; + maintainers = [ maintainers.joedevivo ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2fbd50e7efe5..5a6d5752d8b0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13496,6 +13496,8 @@ with pkgs; zim-tools = callPackage ../tools/text/zim-tools { }; + zimfw = callPackage ../shells/zsh/zimfw { }; + zld = callPackage ../development/tools/zld { }; par = callPackage ../tools/text/par { }; From 1ee7fa3882cd250e8447ee8fb8ea36ce6715f72d Mon Sep 17 00:00:00 2001 From: Ian Kerins Date: Tue, 10 Jan 2023 23:18:30 -0500 Subject: [PATCH 060/163] invidious: unstable-2023-01-08 -> unstable-2023-01-10 At long last, this restores pagination to the channel view. --- pkgs/servers/invidious/versions.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/invidious/versions.json b/pkgs/servers/invidious/versions.json index b41eddff1e46..005627dd7e9d 100644 --- a/pkgs/servers/invidious/versions.json +++ b/pkgs/servers/invidious/versions.json @@ -4,9 +4,9 @@ "sha256": "sha256-EU6T9yQCdOLx98Io8o01rEsgxDFF/Xoy42LgPopD2/A=" }, "invidious": { - "rev": "927c37ce3eb306fe6a02c0fdb9e3ee0a837e84d2", - "sha256": "sha256-l5DDSopd4ueA0IoPovIPjGqCm3LZE8802Sh2EduLtuU=", - "version": "unstable-2023-01-08" + "rev": "05258d56bdc3f4de1f0da0c0dbd2d540f68cbdd5", + "sha256": "sha256-5vA9LCtHgXj7Pn5U/oLDKnwR/ZNtayl2QBA9jkzs98E=", + "version": "unstable-2023-01-10" }, "lsquic": { "sha256": "sha256-hG8cUvhbCNeMOsKkaJlgGpzUrIx47E/WhmPIdI5F3qM=", From 520dd5604ff73c473d3d06a9413e26d64f1bc6b3 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 11 Jan 2023 10:55:36 -0500 Subject: [PATCH 061/163] cargo-deny: 0.13.5 -> 0.13.7 Diff: https://github.com/EmbarkStudios/cargo-deny/compare/0.13.5...0.13.7 Changelog: https://github.com/EmbarkStudios/cargo-deny/blob/0.13.7/CHANGELOG.md --- pkgs/development/tools/rust/cargo-deny/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-deny/default.nix b/pkgs/development/tools/rust/cargo-deny/default.nix index 3d4b82b8edee..531772889558 100644 --- a/pkgs/development/tools/rust/cargo-deny/default.nix +++ b/pkgs/development/tools/rust/cargo-deny/default.nix @@ -11,19 +11,19 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deny"; - version = "0.13.5"; + version = "0.13.7"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = pname; rev = version; - sha256 = "sha256-fwuAUsqVEL9MCjNoUBPQI78u+c289cbNCB4Kh8VM/vo="; + sha256 = "sha256-E9tFzac6WkEGfsXj1nykQAR20+5Pi5xMd82MeDed9qg="; }; # enable pkg-config feature of zstd cargoPatches = [ ./zstd-pkg-config.patch ]; - cargoSha256 = "sha256-hnD/xZtQRVABTtdxqNcJYIsGuklNT8dxr5wpAlP/Qqs="; + cargoSha256 = "sha256-E3Gg7PwBNVkvX2vqtbCxz0kbe1ZWrcAWxj6OJtENBe0="; nativeBuildInputs = [ pkg-config ]; From 0dee0eec6aaa6c8dcff19bb1408f6cc1800dd3d7 Mon Sep 17 00:00:00 2001 From: Allen Short Date: Wed, 11 Jan 2023 09:48:17 -0600 Subject: [PATCH 062/163] typescript-language-server: include typescript This became a hard dependency in 2.2.0. Fixes #210051. --- pkgs/development/node-packages/overrides.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index 29a496a08c77..263c343a03f2 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -561,8 +561,7 @@ final: prev: { typescript-language-server = prev.typescript-language-server.override { nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; postInstall = '' - wrapProgram "$out/bin/typescript-language-server" \ - --suffix PATH : ${lib.makeBinPath [ final.typescript ]} + ${pkgs.xorg.lndir}/bin/lndir ${final.typescript} $out ''; }; From 6b16d2c40649c7db3ecd42d2fc4d7118c1e7e155 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 11 Jan 2023 18:33:41 +0100 Subject: [PATCH 063/163] python3Packages.hassil: 0.1.4 -> 0.2.3 https://github.com/home-assistant/hassil/releases/tag/v0.2.3 --- pkgs/development/python-modules/hassil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hassil/default.nix b/pkgs/development/python-modules/hassil/default.nix index 84800b51381a..6d5929c8c106 100644 --- a/pkgs/development/python-modules/hassil/default.nix +++ b/pkgs/development/python-modules/hassil/default.nix @@ -16,7 +16,7 @@ let pname = "hassil"; - version = "0.1.4"; + version = "0.2.3"; in buildPythonPackage { inherit pname version; @@ -24,7 +24,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-ygaPdfH2jBk2xvlgt7V8/VcZAtv6Lwsi8g+stK/DdT8="; + hash = "sha256-YT8FgvM0mlB8ri9WHLau+e4m+wyEI4mHWxXbhiI60h0="; }; nativeBuildInputs = [ From 5d4a45d639a54c37385d043e94578583b5519286 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 11 Jan 2023 19:19:44 +0000 Subject: [PATCH 064/163] libva-utils: 2.16.0 -> 2.17.0 --- pkgs/development/libraries/libva/utils.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libva/utils.nix b/pkgs/development/libraries/libva/utils.nix index 85a2b1835244..dff497fbdc30 100644 --- a/pkgs/development/libraries/libva/utils.nix +++ b/pkgs/development/libraries/libva/utils.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "libva-utils"; - version = "2.16.0"; + version = "2.17.0"; src = fetchFromGitHub { owner = "intel"; repo = "libva-utils"; rev = version; - sha256 = "sha256-6gjOheppHGTHUoT+pVJ6Tfgj9qDB+/MjaI3Win4ULRM="; + sha256 = "sha256-zv62Jznifw3GG5n8CIE7rJu0POx0aT8btO9N6CoBfAE="; }; nativeBuildInputs = [ meson ninja pkg-config ]; From 9493405d546419cb4975eefab0b66a8d3a0796a9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 Jan 2023 21:40:09 +0100 Subject: [PATCH 065/163] python310Packages.aioaladdinconnect: 0.1.50 -> 0.1.52 Changelog: https://github.com/mkmer/AIOAladdinConnect/releases/tag/0.1.52 --- pkgs/development/python-modules/aioaladdinconnect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioaladdinconnect/default.nix b/pkgs/development/python-modules/aioaladdinconnect/default.nix index a713713cead6..27475fc2a09f 100644 --- a/pkgs/development/python-modules/aioaladdinconnect/default.nix +++ b/pkgs/development/python-modules/aioaladdinconnect/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "aioaladdinconnect"; - version = "0.1.50"; + version = "0.1.52"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "AIOAladdinConnect"; inherit version; - hash = "sha256-5IeqIEIQzPq5GkuAf/92J0SBI3Lu1ftJ4UOj4oQLQC4="; + hash = "sha256-lpEpdc2izNP1xSnGsG1WMvrRqRToNrLpZn225XnZ+pI="; }; propagatedBuildInputs = [ From d4617c31bb927221105c257d64b5b380592f3ee6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 Jan 2023 21:52:19 +0100 Subject: [PATCH 066/163] python310Packages.pook: add changelog to meta --- pkgs/development/python-modules/pook/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pook/default.nix b/pkgs/development/python-modules/pook/default.nix index 35829044c3cf..2ce3f26ec897 100644 --- a/pkgs/development/python-modules/pook/default.nix +++ b/pkgs/development/python-modules/pook/default.nix @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "h2non"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-4OGcnuajGdBRlXCYwbTK/zLNQRrir60qCYajHRRCpkU="; + rev = "refs/tags/v${version}"; + hash = "sha256-4OGcnuajGdBRlXCYwbTK/zLNQRrir60qCYajHRRCpkU="; }; propagatedBuildInputs = [ @@ -36,11 +36,14 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "pook" ]; + pythonImportsCheck = [ + "pook" + ]; meta = with lib; { description = "HTTP traffic mocking and testing made simple in Python"; homepage = "https://github.com/h2non/pook"; + changelog = "https://github.com/h2non/pook/blob/v${version}/History.rst"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From 9408fdff46d9e71c1f59adaebb5ef0e0ba24ece3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 Jan 2023 21:53:13 +0100 Subject: [PATCH 067/163] python310Packages.pook: 1.0.2 -> 1.1.0 Diff: https://github.com/h2non/pook/compare/refs/tags/v1.0.2...v1.1.0 Changelog: https://github.com/h2non/pook/blob/v1.1.0/History.rst --- pkgs/development/python-modules/pook/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pook/default.nix b/pkgs/development/python-modules/pook/default.nix index 2ce3f26ec897..af61434abd6f 100644 --- a/pkgs/development/python-modules/pook/default.nix +++ b/pkgs/development/python-modules/pook/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pook"; - version = "1.0.2"; + version = "1.1.0"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "h2non"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-4OGcnuajGdBRlXCYwbTK/zLNQRrir60qCYajHRRCpkU="; + hash = "sha256-5hVRyZCA5VzufiYh1l9ezob1iuT8/VXhuFjC0OjGsbQ="; }; propagatedBuildInputs = [ From 2725cc59a63f1aa131f2e5e790b8c11f90433936 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 11 Jan 2023 16:07:18 -0500 Subject: [PATCH 068/163] perlPackages.TextFormat: update homepage --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 624eacbd26f1..afa7d0190e3d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -25137,7 +25137,7 @@ let }; meta = { description = "Various subroutines to format text"; - homepage = "https://www.shlomifish.org/open-source/projects/Text-Format"; + homepage = "https://github.com/shlomif/perl-Module-Format"; license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ bcdarwin ]; }; From c5b7a74ca1c1aed74e4a7320069b81fc32371888 Mon Sep 17 00:00:00 2001 From: Nate Smith Date: Wed, 11 Jan 2023 16:11:03 -0500 Subject: [PATCH 069/163] pgformatter: 5.3 -> 5.4 https://github.com/darold/pgFormatter/releases/tag/v5.4 --- pkgs/development/tools/pgformatter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/pgformatter/default.nix b/pkgs/development/tools/pgformatter/default.nix index 2fbde805905b..9e792a49733b 100644 --- a/pkgs/development/tools/pgformatter/default.nix +++ b/pkgs/development/tools/pgformatter/default.nix @@ -2,13 +2,13 @@ perlPackages.buildPerlPackage rec { pname = "pgformatter"; - version = "5.3"; + version = "5.4"; src = fetchFromGitHub { owner = "darold"; repo = "pgFormatter"; rev = "v${version}"; - sha256 = "sha256-W6xIUQhCUuPo2oIArqlM8RX2hlrPts12rTQQo+/74iM="; + sha256 = "sha256-z90V4aKp5gIZMWQha3gHpTMtpYVsGhFtPWHiJuFt3qA="; }; outputs = [ "out" ]; From b53f7b3cfeeaf788ff799cb8f7541c53039282be Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 11 Jan 2023 13:38:01 -0800 Subject: [PATCH 070/163] oh-my-zsh: 2022-11-08 -> 2023-01-09 (#210105) --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 15ac49c80fff..32c08d3dddc3 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert, bash }: stdenv.mkDerivation rec { - version = "2022-11-08"; + version = "2023-01-09"; pname = "oh-my-zsh"; - rev = "1f30c1a079cd10030578e38f8562dc5be53d0fd3"; + rev = "4181e8a2cc936bc7b7a89d674bf261023159ed35"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "qwRUzH1R/K5Y3bpzkgJWSyI+aBHRmrycNKlRAjjmv0w="; + sha256 = "kne/2ErEqUqBx1xzQrvk6scrhOZYJDlUnNOlx0MbqNQ="; }; strictDeps = true; From 9c66fd5c7e176095552d180547b29e678fa9071d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 11 Jan 2023 13:39:30 -0800 Subject: [PATCH 071/163] simpleBuildTool: 1.7.3 -> 1.8.2 (#209607) --- pkgs/development/tools/build-managers/sbt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index 16528cbfc2fd..5d7175fe9e80 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "sbt"; - version = "1.7.3"; + version = "1.8.2"; src = fetchurl { url = "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"; - sha256 = "sha256-J4bDI5bLiH9Gz8OlU5eHJRPsdahJ6uqfTwFGkoycsGA="; + sha256 = "sha256-H2U0TaB029Zt/vqTwO/40xnXcuXK1H/L62rheLvfRoY="; }; postPatch = '' From 4af8ac5eea12a041c37b17e7c7daf441d96f1790 Mon Sep 17 00:00:00 2001 From: Ben Orchard Date: Wed, 11 Jan 2023 21:44:07 +0000 Subject: [PATCH 072/163] haskellPackages.posix-api: unmark broken (disable tests) Tests are currently broken. Fix pending: https://github.com/andrewthad/posix-api/pull/14 --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 58ff735c5a6b..94d94f180c8c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2315,4 +2315,8 @@ self: super: { revision = null; editedCabalFile = null; }) super.true-name); + + # posix-api has had broken tests since 2020 (until at least 2023-01-11) + # raehik has a fix pending: https://github.com/andrewthad/posix-api/pull/14 + posix-api = dontCheck super.posix-api; } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 70771427435b..34be5adc66b2 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -4080,7 +4080,6 @@ broken-packages: - posit - positron - posix-acl - - posix-api - posix-realtime - posix-waitpid - postcodes diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 9f3a055860c5..4bdef102a901 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -225173,8 +225173,6 @@ self: { description = "posix bindings"; license = lib.licenses.bsd3; badPlatforms = lib.platforms.darwin; - hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) systemd;}; "posix-error-codes" = callPackage From 49927672f7a7bd9d3d514f177c8f3cd860ffe9cc Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 2 Dec 2022 11:07:48 +0000 Subject: [PATCH 073/163] hivex: clarify license > The license for this library is LGPL v2.1, but not later versions. --- pkgs/development/libraries/hivex/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/hivex/default.nix b/pkgs/development/libraries/hivex/default.nix index 85ca439b88fc..9648354586e3 100644 --- a/pkgs/development/libraries/hivex/default.nix +++ b/pkgs/development/libraries/hivex/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Windows registry hive extraction library"; - license = licenses.lgpl2; + license = licenses.lgpl2Only; homepage = "https://github.com/libguestfs/hivex"; maintainers = with maintainers; [offline]; platforms = platforms.unix; From 39fd1c608c5ac7d381c4fde36000ad8c7f800c47 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 2 Dec 2022 11:08:27 +0000 Subject: [PATCH 074/163] hivex: enable parallel building Tested at -j4. --- pkgs/development/libraries/hivex/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/hivex/default.nix b/pkgs/development/libraries/hivex/default.nix index 9648354586e3..c0bc0e3faa63 100644 --- a/pkgs/development/libraries/hivex/default.nix +++ b/pkgs/development/libraries/hivex/default.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { ++ (with perlPackages; [ perl IOStringy ]) ++ lib.optionals stdenv.isDarwin [ libintl ]; + enableParallelBuilding = true; + postInstall = '' wrapProgram $out/bin/hivexregedit \ --set PERL5LIB "$out/${perlPackages.perl.libPrefix}" \ From 22f9452996b372325c51b45dbd75cf1ec499d75d Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 2 Dec 2022 11:56:08 +0000 Subject: [PATCH 075/163] hivex: strictDeps Actually getting this to cross-compile will take a bunch more effort, but this is a start. --- pkgs/development/libraries/hivex/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/hivex/default.nix b/pkgs/development/libraries/hivex/default.nix index c0bc0e3faa63..ec94e53afa2c 100644 --- a/pkgs/development/libraries/hivex/default.nix +++ b/pkgs/development/libraries/hivex/default.nix @@ -1,5 +1,6 @@ -{ lib, stdenv, fetchurl, pkg-config, autoreconfHook, makeWrapper -, perlPackages, libxml2, libintl }: +{ lib, stdenv, fetchurl, pkg-config, autoreconfHook, makeWrapper, perlPackages +, libxml2, libintl +}: stdenv.mkDerivation rec { pname = "hivex"; @@ -12,7 +13,8 @@ stdenv.mkDerivation rec { patches = [ ./hivex-syms.patch ]; - nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config ]; + strictDeps = true; + nativeBuildInputs = [ autoreconfHook makeWrapper perlPackages.perl pkg-config ]; buildInputs = [ libxml2 ] From 94ba1055239297f21cdbb275027604d88722cd10 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 2 Dec 2022 11:56:56 +0000 Subject: [PATCH 076/163] hivex: build OCaml bindings These are used by libguestfs's optional appliance builder program. I haven't been able to get that working yet, but this is a prerequisite. --- pkgs/development/libraries/hivex/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/hivex/default.nix b/pkgs/development/libraries/hivex/default.nix index ec94e53afa2c..650fd5bb6df1 100644 --- a/pkgs/development/libraries/hivex/default.nix +++ b/pkgs/development/libraries/hivex/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, autoreconfHook, makeWrapper, perlPackages -, libxml2, libintl +, ocamlPackages, libxml2, libintl }: stdenv.mkDerivation rec { @@ -13,8 +13,14 @@ stdenv.mkDerivation rec { patches = [ ./hivex-syms.patch ]; + postPatch = '' + substituteInPlace ocaml/Makefile.am \ + --replace '$(DESTDIR)$(OCAMLLIB)' '$(out)/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib' + ''; + strictDeps = true; - nativeBuildInputs = [ autoreconfHook makeWrapper perlPackages.perl pkg-config ]; + nativeBuildInputs = [ autoreconfHook makeWrapper perlPackages.perl pkg-config ] + ++ (with ocamlPackages; [ ocaml findlib ]); buildInputs = [ libxml2 ] From ad9f07825f16d4f79dafeb44dab572c27c052c4a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 11 Jan 2023 22:16:12 +0000 Subject: [PATCH 077/163] oculante: 0.6.38 -> 0.6.39 --- pkgs/applications/graphics/oculante/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/oculante/default.nix b/pkgs/applications/graphics/oculante/default.nix index 65300df69048..041b311ce1b6 100644 --- a/pkgs/applications/graphics/oculante/default.nix +++ b/pkgs/applications/graphics/oculante/default.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage rec { pname = "oculante"; - version = "0.6.38"; + version = "0.6.39"; src = fetchFromGitHub { owner = "woelper"; repo = pname; rev = version; - sha256 = "sha256-0msPeW0FoBzHBDfX2iFH4HzAknaGPNThuCLi2vhdK08="; + sha256 = "sha256-5onRdxfI5RPa2/Ou9pH84u83Dg79+eMIIYhcEnZrP8A="; }; - cargoSha256 = "sha256-eKRn8MC4/jjPRoajhwrtXsa8n9bGO5MAKjDuwHWs7Oc="; + cargoHash = "sha256-Mf2WuTctF0a6YNquntTizRxwq6aqTTnr8QRS/BBVqCo="; nativeBuildInputs = [ cmake From 250e410a922368f47ceb0f706b667dff40b9b4b9 Mon Sep 17 00:00:00 2001 From: Adam Joseph <54836058+amjoseph-nixpkgs@users.noreply.github.com> Date: Wed, 11 Jan 2023 23:06:36 +0000 Subject: [PATCH 078/163] qt-6/modules/qtbase: add systemdSupport parameter (#192057) --- pkgs/development/libraries/qt-6/modules/qtbase.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-6/modules/qtbase.nix b/pkgs/development/libraries/qt-6/modules/qtbase.nix index 5bbed5cb51e5..93801ae51a3f 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-6/modules/qtbase.nix @@ -23,6 +23,7 @@ , double-conversion , util-linux , systemd +, systemdSupport ? stdenv.isLinux , libb2 , md4c , mtdev @@ -129,7 +130,9 @@ stdenv.mkDerivation rec { unixODBCDrivers.mariadb ] ++ lib.optionals stdenv.isLinux [ util-linux + ] ++ lib.optionals systemdSupport [ systemd + ] ++ [ mtdev lksctp-tools libselinux @@ -219,7 +222,7 @@ stdenv.mkDerivation rec { "-DQT_FEATURE_openssl_linked=ON" ] ++ lib.optionals (!stdenv.isDarwin) [ "-DQT_FEATURE_sctp=ON" - "-DQT_FEATURE_journald=ON" + "-DQT_FEATURE_journald=${if systemdSupport then "ON" else "OFF"}" "-DQT_FEATURE_vulkan=ON" ] ++ lib.optionals stdenv.isDarwin [ # build as a set of dynamic libraries From c08a7c06eb19a9997ea06a4eb3cd8afd1e99e368 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 12 Jan 2023 00:23:06 +0100 Subject: [PATCH 079/163] evcc: 0.111.0 -> 0.111.1 https://github.com/evcc-io/evcc/releases/tag/0.111.1 --- pkgs/servers/home-automation/evcc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix index 5870e1c3029a..88c7c5a3def9 100644 --- a/pkgs/servers/home-automation/evcc/default.nix +++ b/pkgs/servers/home-automation/evcc/default.nix @@ -16,13 +16,13 @@ buildGoModule rec { pname = "evcc"; - version = "0.111.0"; + version = "0.111.1"; src = fetchFromGitHub { owner = "evcc-io"; repo = pname; rev = version; - hash = "sha256-amXB4iLZJXJuU4gaTSpDc+kNoTVx08EUis0ld0XtcMs="; + hash = "sha256-2ZxEUhDNF2E5http8Pz21L0tw6r4UOK5XYDXbHJDnEU="; }; vendorHash = "sha256-+qne/eB+z8e0vStC9V0w7jgWgo3vvkaR42dUe+/eXDE="; From f967b6a8e60cfaade97bc0181d3b879252859674 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 11 Jan 2023 23:58:54 +0000 Subject: [PATCH 080/163] gotrue-supabase: 2.35.0 -> 2.40.1 --- pkgs/tools/security/gotrue/supabase.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/gotrue/supabase.nix b/pkgs/tools/security/gotrue/supabase.nix index 5cdbe402501c..5ae79472c949 100644 --- a/pkgs/tools/security/gotrue/supabase.nix +++ b/pkgs/tools/security/gotrue/supabase.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gotrue"; - version = "2.35.0"; + version = "2.40.1"; src = fetchFromGitHub { owner = "supabase"; repo = pname; rev = "v${version}"; - hash = "sha256-uFE2pcEpGhrl8LcZLvYEMlq8sgRmFkltf3H8huZzXpM="; + hash = "sha256-PXWGjuLUHo+adlomL2HqdY7cPqFIS0ttg7hYHNbAWP4="; }; - vendorHash = "sha256-uchgHxUczb4IIUkUdHWyeXWr2LXda6eWwjQxUBcPDoA="; + vendorHash = "sha256-3dXfg9tblPx9V5LzzVm3UtCwGcPIAm2MaKm9JQi69mU="; ldflags = [ "-s" From 5fe2aa39debf398d0053b0c475de7cf37ef8fece Mon Sep 17 00:00:00 2001 From: Uri Baghin Date: Thu, 12 Jan 2023 11:15:49 +1100 Subject: [PATCH 081/163] envoy: fix deps hashes --- pkgs/servers/http/envoy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/envoy/default.nix b/pkgs/servers/http/envoy/default.nix index 709726bc846d..aed6a36be1d7 100644 --- a/pkgs/servers/http/envoy/default.nix +++ b/pkgs/servers/http/envoy/default.nix @@ -83,8 +83,8 @@ buildBazelPackage rec { fetchAttrs = { sha256 = { - x86_64-linux = "sha256-drgZSTCDcef9jNZ6E8KtqxqkxhnQ+UiYo5CeUPBPryE="; - aarch64-linux = "sha256-FJwLUT3NVEH6u9756n2+J83FiKGsvIvlllbDvW+wpSI="; + x86_64-linux = "sha256-UXTh5sCN7PJxNbTaG47YnW7aQBBtu101UjfsWU1CtBw="; + aarch64-linux = "sha256-uynV2/RWBybR2bjErDjcfoacv5vsI4GJ3SL4OF1kFOE="; }.${stdenv.system} or (throw "unsupported system ${stdenv.system}"); dontUseCmakeConfigure = true; dontUseGnConfigure = true; From dab251a32af94e12d67535cf60060e702cec0fdc Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 12 Jan 2023 08:20:26 +0800 Subject: [PATCH 082/163] julia_18-bin: 1.8.4 -> 1.8.5 --- pkgs/development/compilers/julia/1.8-bin.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/julia/1.8-bin.nix b/pkgs/development/compilers/julia/1.8-bin.nix index b72cb8f18743..01806fc208a1 100644 --- a/pkgs/development/compilers/julia/1.8-bin.nix +++ b/pkgs/development/compilers/julia/1.8-bin.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { pname = "julia-bin"; - version = "1.8.4"; + version = "1.8.5"; src = { x86_64-linux = fetchurl { url = "https://julialang-s3.julialang.org/bin/linux/x64/${lib.versions.majorMinor version}/julia-${version}-linux-x86_64.tar.gz"; - sha256 = "sha256-8EJ6TXkQxH3Hwx9lun7Kr+27wOzrOcMgo3+jNZgAT9U="; + sha256 = "sha256-5xokgW6P6dX0gHZky7tCc49aqf4FOX01yB1MXWSbnQU="; }; aarch64-linux = fetchurl { url = "https://julialang-s3.julialang.org/bin/linux/aarch64/${lib.versions.majorMinor version}/julia-${version}-linux-aarch64.tar.gz"; - sha256 = "sha256-3EeYwc6HaPo1ly6LFJyjqF/GnhB0tgmnKyz+1cSqcFA="; + sha256 = "sha256-ofY3tExx6pvJbXw+80dyTAVKHlInuYCt6/wzWZ5RU6Q="; }; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); From d837321d0952aa8d49f07293e2dca05174c2adb5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 12 Jan 2023 00:22:44 +0000 Subject: [PATCH 083/163] doggo: 0.5.4 -> 0.5.5 --- pkgs/tools/networking/doggo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/doggo/default.nix b/pkgs/tools/networking/doggo/default.nix index 68ac50221b68..d267cf276c49 100644 --- a/pkgs/tools/networking/doggo/default.nix +++ b/pkgs/tools/networking/doggo/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "doggo"; - version = "0.5.4"; + version = "0.5.5"; src = fetchFromGitHub { owner = "mr-karan"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6jNs8vigrwKk47Voe42J9QYMTP7KnNAtJ5vFZTUW680="; + sha256 = "sha256-qc6RYz2bVaY/IBGIXUYO6wyh7iUDAJ1ASCK0dFwZo6s="; }; - vendorSha256 = "sha256-pyzu89HDFrMQqYJZC2vdqzOc6PiAbqhaTgYakmN0qj8="; + vendorHash = "sha256-UhSdYpK54c4+BAP/d/zU91LIBE05joOLHoV1XkNMYNw="; nativeBuildInputs = [ installShellFiles ]; subPackages = [ "cmd/doggo" ]; From f9b4295a83bea4ada78d27d1dcb2f75e6ab08cfc Mon Sep 17 00:00:00 2001 From: nixpkgs-upkeep-bot Date: Thu, 12 Jan 2023 00:23:16 +0000 Subject: [PATCH 084/163] vscode: 1.74.2 -> 1.74.3 --- pkgs/applications/editors/vscode/vscode.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 16f723020d8a..1d684f3ee3f3 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -18,17 +18,17 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0xdj5v2n34d6p49ng13qr9d4yyyvqr96qv15la2fda9s7n1s659c"; - x86_64-darwin = "0jgrf534qy39nki0rfc8lrdbdb8ghzarckd3cx9fzq6bw1p2jy1f"; - aarch64-linux = "133577j6i709dq4ircnh2yklylcmy0kgs6lhly7mx8nrag8qi9c1"; - aarch64-darwin = "18346igq8b1d0kywy9alvzm0glb46aalznnhr5mql5rhaana92xw"; - armv7l-linux = "0l0wvgi981ryqbhyh5qalr8lasyf3pg4pzqs9f9hc75ppk4d6sny"; + x86_64-linux = "192csxsvxdnizdi2jnh0w243h54cb4r99y4p9mnck813bnlcplf5"; + x86_64-darwin = "0l5n7ba3gd7f73dag52ccd26076a37jvr5a3npyd0078nby0d5n4"; + aarch64-linux = "073czaap96ddchmsdx7wjqfm68pgimwrngmy2rfgj4b7a0iw3jg6"; + aarch64-darwin = "1nl3xpjw4ci0z0g7jx5z3v9j6l4vka5w1ijsf2qvrwa27pp8n6hk"; + armv7l-linux = "10vcmicrk19qi8l01hkvxlay8gqk5qlkx0kpax0blkk91cifqzg7"; }.${system} or throwSystem; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.74.2"; + version = "1.74.3"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; From 0c5559cf4f2ed17653ba267f3fda1b229033a9c2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 12 Jan 2023 00:36:14 +0000 Subject: [PATCH 085/163] promql-cli: 0.2.1 -> 0.3.0 --- pkgs/tools/misc/promql-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/promql-cli/default.nix b/pkgs/tools/misc/promql-cli/default.nix index 8bb8222c5df0..a65dfb87ea0a 100644 --- a/pkgs/tools/misc/promql-cli/default.nix +++ b/pkgs/tools/misc/promql-cli/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "promql-cli"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromGitHub { owner = "nalbury"; repo = pname; rev = "v${version}"; - hash = "sha256-uuoUvEBnLxopdt6u4vX6pYnuyOATwJFJo9ozQ9jhSyo="; + hash = "sha256-EV63fdG+GF+kVLH2TxHPhRcUU5xBvkW5bhHC1lEoj84="; }; - vendorHash = "sha256-OLkOyeLyBnNmijNYFrXIZ4nbOvV/65KIKjOFOVS9Yiw="; + vendorHash = "sha256-jhNll04xGaxS6NJTh4spSW9zPrff8jk5OEQiRevPQwU="; ldflags = [ "-s" "-w" ]; From d9c7c7f9b4a165f17babe5913432e1401e2752f7 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 2 Dec 2022 11:14:10 +0000 Subject: [PATCH 086/163] augeas: clarify license > Augeas is distributed under the GNU Lesser General Public > License (LGPL) version 2.1. https://augeas.net/faq.html --- pkgs/tools/system/augeas/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/system/augeas/default.nix b/pkgs/tools/system/augeas/default.nix index 3b3d2864d71a..5d9216763915 100644 --- a/pkgs/tools/system/augeas/default.nix +++ b/pkgs/tools/system/augeas/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Configuration editing tool"; - license = licenses.lgpl2; + license = licenses.lgpl21Only; homepage = "http://augeas.net/"; maintainers = with maintainers; [ offline ]; platforms = platforms.unix; From 5772ed0d87df5fd1b1c9cdb3b92655ac0bf37b5f Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 2 Dec 2022 11:16:33 +0000 Subject: [PATCH 087/163] augeas: use HTTPS for homepage --- pkgs/tools/system/augeas/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/system/augeas/default.nix b/pkgs/tools/system/augeas/default.nix index 5d9216763915..b8991634c0d5 100644 --- a/pkgs/tools/system/augeas/default.nix +++ b/pkgs/tools/system/augeas/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Configuration editing tool"; license = licenses.lgpl21Only; - homepage = "http://augeas.net/"; + homepage = "https://augeas.net/"; maintainers = with maintainers; [ offline ]; platforms = platforms.unix; }; From 257ba60f559d44e39c37f0b06f74fc6bfcad8a39 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 11 Jan 2023 22:02:18 +0000 Subject: [PATCH 088/163] augeas: add meta.changelog --- pkgs/tools/system/augeas/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/system/augeas/default.nix b/pkgs/tools/system/augeas/default.nix index b8991634c0d5..d026ce05a77c 100644 --- a/pkgs/tools/system/augeas/default.nix +++ b/pkgs/tools/system/augeas/default.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { description = "Configuration editing tool"; license = licenses.lgpl21Only; homepage = "https://augeas.net/"; + changelog = "https://augeas.net/news.html"; maintainers = with maintainers; [ offline ]; platforms = platforms.unix; }; From b7ee536dd9d56bf88002882e9e288a8973f58df9 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 2 Dec 2022 11:48:46 +0000 Subject: [PATCH 089/163] augeas: enable parallel building Tested at -j4. --- pkgs/tools/system/augeas/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/system/augeas/default.nix b/pkgs/tools/system/augeas/default.nix index d026ce05a77c..bea2edd553d4 100644 --- a/pkgs/tools/system/augeas/default.nix +++ b/pkgs/tools/system/augeas/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ readline libxml2 ]; + enableParallelBuilding = true; + meta = with lib; { description = "Configuration editing tool"; license = licenses.lgpl21Only; From cbf163490ee48213eb8fe8e75623fc0aaeade0f5 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 2 Dec 2022 10:31:09 +0000 Subject: [PATCH 090/163] supermin: init at 5.2.2 --- .../tools/virtualization/supermin/default.nix | 30 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/tools/virtualization/supermin/default.nix diff --git a/pkgs/tools/virtualization/supermin/default.nix b/pkgs/tools/virtualization/supermin/default.nix new file mode 100644 index 000000000000..b970b66a8f64 --- /dev/null +++ b/pkgs/tools/virtualization/supermin/default.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchurl +, cpio, e2fsprogs, perl, pkg-config, ocamlPackages +, glibc +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "supermin"; + version = "5.2.2"; + + src = fetchurl { + url = "https://download.libguestfs.org/supermin/${lib.versions.majorMinor finalAttrs.version}-stable/supermin-${finalAttrs.version}.tar.gz"; + sha256 = "zjkh02NcgWjPt8oMWoK51c71srJx+Et3bWO4u77sNY4="; + }; + + nativeBuildInputs = [ cpio e2fsprogs perl pkg-config ] + ++ (with ocamlPackages; [ findlib ocaml ]); + buildInputs = lib.optionals stdenv.hostPlatform.isGnu [ glibc glibc.static ]; + + postPatch = '' + patchShebangs src/bin2c.pl + ''; + + meta = with lib; { + homepage = "https://libguestfs.org/supermin.1.html"; + description = "Tool for creating and building supermin appliances"; + maintainers = with maintainers; [ qyliss ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f0d6d5875e9a..f50f92d1994d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1469,6 +1469,8 @@ with pkgs; steamtinkerlaunch = callPackage ../tools/games/steamtinkerlaunch {}; + supermin = callPackage ../tools/virtualization/supermin { }; + sx-go = callPackage ../tools/security/sx-go { }; systeroid = callPackage ../tools/system/systeroid { }; From 1a24bb1d67226eb927ea8c0553c3a17edf36025b Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 12 Jan 2023 10:15:03 +0800 Subject: [PATCH 091/163] stratis-cli: 3.4.0 -> 3.4.1 --- pkgs/tools/filesystems/stratis-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/stratis-cli/default.nix b/pkgs/tools/filesystems/stratis-cli/default.nix index 23b1601a8502..c3051fb16127 100644 --- a/pkgs/tools/filesystems/stratis-cli/default.nix +++ b/pkgs/tools/filesystems/stratis-cli/default.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication rec { pname = "stratis-cli"; - version = "3.4.0"; + version = "3.4.1"; src = fetchFromGitHub { owner = "stratis-storage"; repo = pname; rev = "v${version}"; - hash = "sha256-kB8saMgNIoDCXhxCPG1Mwj7dxrev82leoewajA5g9IM="; + hash = "sha256-S0daUi0rhelip2pwcAP3WGey8BbeMa/7AgSrFfuB+cM="; }; propagatedBuildInputs = with python3Packages; [ From fc63c84bbf446344935e826af840364d04529ae6 Mon Sep 17 00:00:00 2001 From: Akhil Indurti Date: Wed, 11 Jan 2023 18:42:20 -0800 Subject: [PATCH 092/163] calcium: init at 0.4.1 --- .../development/libraries/calcium/default.nix | 43 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/libraries/calcium/default.nix diff --git a/pkgs/development/libraries/calcium/default.nix b/pkgs/development/libraries/calcium/default.nix new file mode 100644 index 000000000000..f73ee91b4f77 --- /dev/null +++ b/pkgs/development/libraries/calcium/default.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, fetchFromGitHub +, mpir +, gmp +, mpfr +, flint +, arb +, antic +}: + +stdenv.mkDerivation rec { + pname = "calcium"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "fredrik-johansson"; + repo = pname; + rev = version; + sha256 = "sha256-Ony2FGMnWyNqD7adGeiDtysHNZ4ClMvQ1ijVPSHJmyc="; + }; + + buildInputs = [ mpir gmp mpfr flint arb antic ]; + + configureFlags = [ + "--with-gmp=${gmp}" + "--with-mpir=${mpir}" + "--with-mpfr=${mpfr}" + "--with-flint=${flint}" + "--with-arb=${arb}" + "--with-antic=${antic}" + ]; + + enableParallelBuilding = true; + + meta = with lib; { + description = "A C library for exact computation with real and complex numbers"; + homepage = "https://fredrikj.net/calcium/"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ smasher164 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f50f92d1994d..14753d024955 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18794,6 +18794,8 @@ with pkgs; }; }); + calcium = callPackage ../development/libraries/calcium {}; + cubeb = callPackage ../development/libraries/audio/cubeb { inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio CoreServices; }; From 71c0ce962e039ac3f8ce4c1f6cd3bd3bf479470d Mon Sep 17 00:00:00 2001 From: Aidan Gauland Date: Thu, 12 Jan 2023 16:00:58 +1300 Subject: [PATCH 093/163] nushell: 0.73.0 -> 0.74.0 --- pkgs/shells/nushell/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index 4e510d47dea6..68b2f95a4034 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -26,16 +26,16 @@ rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.73.0"; + version = "0.74.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-hxcB5nzhVjsC5XYR4Pt3GN4ZEgWpetQQZr0mj3bAnRc="; + sha256 = "sha256-KFCsZmD83FqnB553Tbub95I7s8QGBMZ3rviKAQNcKqA="; }; - cargoSha256 = "sha256-pw+pBZeXuKSaP/qC3aiauXAH/BRR1rQZ2jVVmR1JQhU="; + cargoSha256 = "sha256-DpPyvNr1gh7w9HesmkH6N3ZGOmoZx/BDOQ0fQk84bE8="; # enable pkg-config feature of zstd cargoPatches = [ ./zstd-pkg-config.patch ]; From a5dcbfc488f6cd42677c7afd212fb772135f9403 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 11 Jan 2023 20:01:08 -0800 Subject: [PATCH 094/163] gnome-secrets: 7.0 -> 7.2 Diff: https://gitlab.gnome.org/World/secrets/-/compare/7.0...7.2 --- pkgs/applications/misc/gnome-secrets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gnome-secrets/default.nix b/pkgs/applications/misc/gnome-secrets/default.nix index d39ed4faf4dc..1b8a7e706dde 100644 --- a/pkgs/applications/misc/gnome-secrets/default.nix +++ b/pkgs/applications/misc/gnome-secrets/default.nix @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { pname = "gnome-secrets"; - version = "7.0"; + version = "7.2"; format = "other"; strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943 @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec { owner = "World"; repo = "secrets"; rev = version; - sha256 = "sha256-P/1lKmWpwidW3fz2zxgVnFoHmROTVB//byDedoOC4u0="; + hash = "sha256-CE0iuXYHBhu07mjfXCnAPZQUD1Wy95L+tvBT+uepbrk="; }; nativeBuildInputs = [ From 9afc5a23d5c4fcc2c804207a6614ff2370076c7a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 12 Jan 2023 04:20:00 +0000 Subject: [PATCH 095/163] gallery-dl: 1.24.2 -> 1.24.4 https://github.com/mikf/gallery-dl/releases/tag/v1.24.4 --- pkgs/applications/misc/gallery-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index 2ec4d7df2402..41dab24db353 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "gallery-dl"; - version = "1.24.2"; + version = "1.24.4"; format = "setuptools"; src = fetchPypi { inherit version; pname = "gallery_dl"; - sha256 = "sha256-KqDprKoqpbNpUrM7nAYj71cuMh6U3s65kqVTW2cHeLc="; + sha256 = "sha256-g+nbHpbo6O4zoDJm6MRwCXY9pM73NV7RKR59s+8LM10="; }; propagatedBuildInputs = [ From 45c2a66309e6d6ccffebd368c240ed07f78e345d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 12 Jan 2023 04:20:00 +0000 Subject: [PATCH 096/163] esbuild: 0.16.15 -> 0.16.17 https://github.com/evanw/esbuild/releases/tag/v0.16.16 https://github.com/evanw/esbuild/releases/tag/v0.16.17 --- pkgs/development/tools/esbuild/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index 13664bb21ba2..a9179e7b3729 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.16.15"; + version = "0.16.17"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - hash = "sha256-iTAtPHjrBvHweSIiAbkkbBLgjF3v68jipJEzc0I4G04="; + hash = "sha256-8L8h0FaexNsb3Mj6/ohA37nYLFogo5wXkAhGztGUUsQ="; }; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; From 0eda3803b47a2f022f54e3acbc604464f7ce1c30 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 12 Jan 2023 04:20:00 +0000 Subject: [PATCH 097/163] libpg_query: 15-4.0.0 -> 15-4.1.0 https://github.com/pganalyze/libpg_query/releases/tag/15-4.1.0 --- pkgs/development/libraries/libpg_query/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libpg_query/default.nix b/pkgs/development/libraries/libpg_query/default.nix index cb5f545c9d93..254e5ca51e99 100644 --- a/pkgs/development/libraries/libpg_query/default.nix +++ b/pkgs/development/libraries/libpg_query/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libpg_query"; - version = "15-4.0.0"; + version = "15-4.1.0"; src = fetchFromGitHub { owner = "pganalyze"; repo = "libpg_query"; rev = version; - sha256 = "sha256-2BZT/jGfGwia+Map5OkeTcWVFJssykhrdRT2IDAzrfs="; + hash = "sha256-uZdszDE0UJVeegU1bi0ISYooC4ztNv7W4UQ2gWIjrH8="; }; nativeBuildInputs = [ which ]; From 10e8f38102d303e36a0e2afd0b433ee19c722c6c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 12 Jan 2023 03:07:09 +0000 Subject: [PATCH 098/163] =?UTF-8?q?terraform-providers.baiducloud:=201.19.?= =?UTF-8?q?3=20=E2=86=92=201.19.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index f2c61d190ce0..bc0c421cf7ed 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -149,11 +149,11 @@ }, "baiducloud": { "deleteVendor": true, - "hash": "sha256-tEvD70BbN/4376HjE2Yez2qHOM2o3/Uu925HRnmJNwg=", + "hash": "sha256-CYU8PI/gMVC9lMiQaPd/M1SKjvZ6vaj5iBfLDTieZR4=", "homepage": "https://registry.terraform.io/providers/baidubce/baiducloud", "owner": "baidubce", "repo": "terraform-provider-baiducloud", - "rev": "v1.19.3", + "rev": "v1.19.4", "spdx": "MPL-2.0", "vendorHash": "sha256-3PLBs8LSE5JPtrhmdx+jQsnCrfZQQEUGA7wnf9M72yY=" }, From dfc444403cbd290832499f6366532bb1b167e87b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 12 Jan 2023 03:10:21 +0000 Subject: [PATCH 099/163] =?UTF-8?q?terraform-providers.datadog:=203.19.1?= =?UTF-8?q?=20=E2=86=92=203.20.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index bc0c421cf7ed..24df0ce098ef 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -286,13 +286,13 @@ "vendorHash": "sha256-QlmVrcC1ctjAHOd7qsqc9gpqttKplEy4hlT++cFUZfM=" }, "datadog": { - "hash": "sha256-PSFxY/etCWojqX4Dw4sYjNjYBglT0lw5Qi6OzZtZCP0=", + "hash": "sha256-LZYpKwcNvkmpYfhCuZhxfid42IBhRmzfiHZVYu3XAlA=", "homepage": "https://registry.terraform.io/providers/DataDog/datadog", "owner": "DataDog", "repo": "terraform-provider-datadog", - "rev": "v3.19.1", + "rev": "v3.20.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-+NHssfTu4JM37AYyeaBNzhNrnFGcnpVP2DPZngjKfcg=" + "vendorHash": "sha256-IrSQEu3IDFKM9t+3pkygyrrq8KRI8E0BqTui2TR5nFM=" }, "dhall": { "hash": "sha256-K0j90YAzYqdyJD4aofyxAJF9QBYNMbhSVm/s1GvWuJ4=", From dfd098c651702679b1c051c9e84517ea8567b3ae Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 12 Jan 2023 03:12:35 +0000 Subject: [PATCH 100/163] =?UTF-8?q?terraform-providers.github:=205.13.0=20?= =?UTF-8?q?=E2=86=92=205.14.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 24df0ce098ef..b63c71037909 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -424,11 +424,11 @@ "vendorHash": "sha256-uWTY8cFztXFrQQ7GW6/R+x9M6vHmsb934ldq+oeW5vk=" }, "github": { - "hash": "sha256-foPj/zLJJx3mI1PpDwcThptT5EprEDfakUWRsjaa0nc=", + "hash": "sha256-nzQc+KxsgeUR+9Tu/5xmlwdFzlvVzjPUCY9Fbpgsr7E=", "homepage": "https://registry.terraform.io/providers/integrations/github", "owner": "integrations", "repo": "terraform-provider-github", - "rev": "v5.13.0", + "rev": "v5.14.0", "spdx": "MIT", "vendorHash": null }, From 462682c1ea631f516313ab30adc15fd98e8222f1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 12 Jan 2023 03:12:54 +0000 Subject: [PATCH 101/163] =?UTF-8?q?terraform-providers.alicloud:=201.195.0?= =?UTF-8?q?=20=E2=86=92=201.196.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index b63c71037909..ea550ca7e42e 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -48,11 +48,11 @@ "vendorHash": "sha256-pz+h8vbdCEgNSH9AoPlIP7zprViAMawXk64SV0wnVPo=" }, "alicloud": { - "hash": "sha256-Ym3ZN4bRcLXyjnSvWxq/RNvjkfGdpyfkp4sH1D/Ll28=", + "hash": "sha256-OXgvI9NbZLvCrXEMW6FcJsGmM5VUgRGCbrWuRAOeDbY=", "homepage": "https://registry.terraform.io/providers/aliyun/alicloud", "owner": "aliyun", "repo": "terraform-provider-alicloud", - "rev": "v1.195.0", + "rev": "v1.196.0", "spdx": "MPL-2.0", "vendorHash": null }, From a26513da4189862bdf104f7c8ebccba2082f8026 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 12 Jan 2023 03:14:01 +0000 Subject: [PATCH 102/163] =?UTF-8?q?terraform-providers.grafana:=201.32.0?= =?UTF-8?q?=20=E2=86=92=201.33.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index ea550ca7e42e..3b37fd0927c6 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -471,13 +471,13 @@ "vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g=" }, "grafana": { - "hash": "sha256-eDrLyLlK/6zigBW7IW+w4FtHP5eW82zo2+Ow55H0SKc=", + "hash": "sha256-cEoen5f/FmO241mvXBCs0lzsppybQCACaNYUWT597lU=", "homepage": "https://registry.terraform.io/providers/grafana/grafana", "owner": "grafana", "repo": "terraform-provider-grafana", - "rev": "v1.32.0", + "rev": "v1.33.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-s6VwvxHXny5gCrbxiRI3F7w3HR3lq2NeiHZgTiU37m0=" + "vendorHash": "sha256-Eb4J8udIAj7M+72//Pgc4jXhpZ1md1lnh4sKboXVObg=" }, "gridscale": { "hash": "sha256-ahYCrjrJPEItGyqbHYtgkIH/RzMyxBQkebSAyd8gwYo=", From fbdb0a48573f5ce0c0a42d00f32b962adc8b31fb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 12 Jan 2023 03:14:48 +0000 Subject: [PATCH 103/163] =?UTF-8?q?terraform-providers.local:=202.2.3=20?= =?UTF-8?q?=E2=86=92=202.3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 3b37fd0927c6..03eef4c689a4 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -688,13 +688,13 @@ "vendorHash": "sha256-Jlg3a91pOhMC5SALzL9onajZUZ2H9mXfU5CKvotbCbw=" }, "local": { - "hash": "sha256-l9XQpIMMar7ForZuBcGOmqrRuSnthIrilr4CHJ5SiaU=", + "hash": "sha256-7P6p23lQ/2Ko/RKETVe7oSZUDwKeGdznUSvbxPWds+Y=", "homepage": "https://registry.terraform.io/providers/hashicorp/local", "owner": "hashicorp", "repo": "terraform-provider-local", - "rev": "v2.2.3", + "rev": "v2.3.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-5rqn9/NE7Q0VI6SRd2VFKJl4npz9Y0Qp1pEpfj9KxrQ=" + "vendorHash": "sha256-NXSquRqBaENxWX+ZukDJie/EU+wdEQSxvZQEZqjL+ug=" }, "lxd": { "hash": "sha256-2YqziG5HZbD/Io/vKYZFZK1PFYVYHOjzHah7s3xEtR0=", From 0664976e13962773db06b38ef1ba4ed488a6fa34 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 12 Jan 2023 03:17:27 +0000 Subject: [PATCH 104/163] =?UTF-8?q?terraform-providers.opentelekomcloud:?= =?UTF-8?q?=201.32.1=20=E2=86=92=201.32.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 03eef4c689a4..1bcd12622e7a 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -861,13 +861,13 @@ "vendorHash": "sha256-hHwFm+gSMjN4YQEFd/dd50G0uZsxzqi21tHDf4mPBLY=" }, "opentelekomcloud": { - "hash": "sha256-UCnFMsxYD0eGJCtdbV77T62lpmfUH7OZlfL5YEYwcnA=", + "hash": "sha256-brODSqSwZXy3B/F5jqPz1h5UJ2hNncG7tIpICJjoBW4=", "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud", "owner": "opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.32.1", + "rev": "v1.32.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-gVkbVF2eG8k9vy4BuuoY+s5Uw1QMJ0Q2BHtHDMRpDvY=" + "vendorHash": "sha256-p01ZIAt8cUv/UklRnMu+TTmfEw8jdde9C4nUJrhA7wE=" }, "opsgenie": { "hash": "sha256-6lbJyBppfRqqmYpPgyzUTvnvHPSWjE3SJULqliZ2iUI=", From dfa9af71817ddce9aa8fcb45abdfcd1774392fdb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 12 Jan 2023 03:22:10 +0000 Subject: [PATCH 105/163] =?UTF-8?q?terraform-providers.oci:=204.102.0=20?= =?UTF-8?q?=E2=86=92=204.103.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 1bcd12622e7a..05beb1fabbcd 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -816,11 +816,11 @@ "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" }, "oci": { - "hash": "sha256-xGzttO71GTQ9th8qYhVz5EzRIBIWDjkeMUs/TjkUnKU=", + "hash": "sha256-QnDamqv8Vo4MjUE15QQH75v3C6CpMBTzlJzq/EbSZ3E=", "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", "repo": "terraform-provider-oci", - "rev": "v4.102.0", + "rev": "v4.103.0", "spdx": "MPL-2.0", "vendorHash": null }, From fd52463324e2fcb4336d1beca10ff7d908720446 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 12 Jan 2023 03:22:52 +0000 Subject: [PATCH 106/163] =?UTF-8?q?terraform-providers.tencentcloud:=201.7?= =?UTF-8?q?9.4=20=E2=86=92=201.79.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 05beb1fabbcd..a7be53563107 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1095,11 +1095,11 @@ "vendorHash": "sha256-2wPmLpjhG6QgG+BUCO0oIzHjBOWIOYuptgdtSIm9TZw=" }, "tencentcloud": { - "hash": "sha256-6rwpOXd/1iCgCDhWI7e5GuQu112KaYIvkgdyRpehI7I=", + "hash": "sha256-jCtTe1Wi9gvNd1IP+3kYlPYVBT45UkdjlhmNLhEgA10=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.79.4", + "rev": "v1.79.5", "spdx": "MPL-2.0", "vendorHash": null }, From 15b8157fefe8d9ea8aa4d1ba7f69c8a8281dcb73 Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Wed, 11 Jan 2023 13:58:20 +0100 Subject: [PATCH 107/163] cri-o: 1.26.0 -> 1.26.1 Signed-off-by: Sascha Grunert --- pkgs/applications/virtualization/cri-o/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 19097ae1d99e..9031f941ab34 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "cri-o"; - version = "1.26.0"; + version = "1.26.1"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "sha256-XVg1TBYD6Y/EByKnnD+mFL/qA6IqBohuEvUgjwN962g="; + sha256 = "sha256-7tbnnERV+dYtEXzloHgWeSFpe8Dl18tiNWoAhIALWjE="; }; vendorSha256 = null; From bacd9d11d540e8baf7aaf4e9f9c926cd9fc99397 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 11 Jan 2023 09:34:49 +1000 Subject: [PATCH 108/163] go_1_18: 1.18.9 -> 1.18.10 --- pkgs/development/compilers/go/1.18.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.18.nix b/pkgs/development/compilers/go/1.18.nix index 1bad4bba76e8..b6f0c371cb01 100644 --- a/pkgs/development/compilers/go/1.18.nix +++ b/pkgs/development/compilers/go/1.18.nix @@ -45,11 +45,11 @@ let in stdenv.mkDerivation rec { pname = "go"; - version = "1.18.9"; + version = "1.18.10"; src = fetchurl { url = "https://go.dev/dl/go${version}.src.tar.gz"; - sha256 = "sha256-++fwm5aso9tvrq8YDai7Yyho7ASXMeNV/2FpUZfA4+o="; + sha256 = "sha256-nO3MpYhF3wyUdK4AJ0xEqVyd+u+xMvxZkhwox8EG+OY="; }; strictDeps = true; From 1f8f2ca19a51c768eda06e3ebd6f1b16eaa633c5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 12 Jan 2023 04:40:19 +0000 Subject: [PATCH 109/163] python310Packages.ansible-later: 3.0.2 -> 3.1.0 --- pkgs/development/python-modules/ansible-later/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible-later/default.nix b/pkgs/development/python-modules/ansible-later/default.nix index 15234692a8a2..ace3d711b9ca 100644 --- a/pkgs/development/python-modules/ansible-later/default.nix +++ b/pkgs/development/python-modules/ansible-later/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "ansible-later"; - version = "3.0.2"; + version = "3.1.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "thegeeklab"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-+UcrkITiRrAKo5MFcsSqEpvzuo4Czv+rHMWsnuvVx5o="; + hash = "sha256-Mi8CJ3OU27zJ2PNkrqu0BytTI5ZaQezi8DIW3yXCzDI="; }; postPatch = '' From 64f5143ee763751a1bcaee67fd773fcff62fe497 Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Thu, 12 Jan 2023 12:54:58 +0800 Subject: [PATCH 110/163] moar: 1.11.3 -> 1.11.4 --- pkgs/tools/misc/moar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/moar/default.nix b/pkgs/tools/misc/moar/default.nix index 8c76dfd60d36..4a12b8f221a3 100644 --- a/pkgs/tools/misc/moar/default.nix +++ b/pkgs/tools/misc/moar/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "moar"; - version = "1.11.3"; + version = "1.11.4"; src = fetchFromGitHub { owner = "walles"; repo = pname; rev = "v${version}"; - sha256 = "sha256-j/nxZgaK8WZadYjc7f4nJUn282YfBeflWh7lSjA4QVs="; + sha256 = "sha256-Op9A0C1MnVoNyxTEKARASrKDTIT/vNa01Bnww6BWg0Y="; }; vendorSha256 = "sha256-XexIBg49gK+b2Zef5eR7NfqFZHPp5DXhlcC3Loh6PfI="; From 41801c0f7bd061659e5e1a12af2e5d6aad1e08c6 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 12 Jan 2023 00:01:08 -0500 Subject: [PATCH 111/163] ruff: 0.0.218 -> 0.0.219 Diff: https://github.com/charliermarsh/ruff/compare/v0.0.218...v0.0.219 Changelog: https://github.com/charliermarsh/ruff/releases/tag/v0.0.219 --- pkgs/development/tools/ruff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index eaa41e9e024a..76c09c064e53 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.218"; + version = "0.0.219"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-H3ZvtYAKF32yqsKOKolA+mqKK+BdxrKW+aWem0b/Hww="; + sha256 = "sha256-Aw3IjU1gBkWOMkHnjs/tddFPax588tsdlamhLJoq9HM="; }; - cargoSha256 = "sha256-+r3kQ9WnVyNZlae5PtZ6SZR7VWqSm+sgHItHUN9Acog="; + cargoSha256 = "sha256-W3t1sAwQx9a7qkM9OcEZ6datdkpxqRi5wwqZglKoK2A="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices From fc8deead30324cc3809d59fe4e80c7b7419690c5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 12 Jan 2023 05:44:47 +0000 Subject: [PATCH 112/163] chezmoi: 2.28.0 -> 2.29.1 --- pkgs/tools/misc/chezmoi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index e0be716b0430..4ef7f685b77f 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.28.0"; + version = "2.29.1"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - hash = "sha256-IZzYW3ynrZJlPgyziwMwysz4ujoFZw4lGBkUFDwjeV0="; + hash = "sha256-fiBnX+y6/w4cbosspzmLf2+tTu8ZsYSJonNSy3kVx08="; }; - vendorHash = "sha256-spZEl3GyJsO5qa77kZlpK1X2jv3EgZwG+8Gz+Zi9Vvc="; + vendorHash = "sha256-cSwbQWWjMuTuCvIYfTeZV+wd18eDLn7bZNEtyaFQHBg="; doCheck = false; From 1df446cf9a34fbd2197310d77f5b0766511701da Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 12 Jan 2023 14:23:06 +1000 Subject: [PATCH 113/163] terraform-providers.netlify: remove meta.broken --- .../networking/cluster/terraform-providers/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index d2759931b7ed..bba4222adb31 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -77,7 +77,6 @@ let # These are the providers that don't fall in line with the default model special-providers = { - netlify = automated-providers.netlify.overrideAttrs (o: { meta = o.meta // { broken = stdenv.isDarwin; }; }); pass = automated-providers.pass.overrideAttrs (o: { meta = o.meta // { broken = stdenv.isDarwin; }; }); tencentcloud = automated-providers.tencentcloud.overrideAttrs (o: { meta = o.meta // { broken = stdenv.isDarwin; }; }); # github api seems to be broken, doesn't just fail to recognize the license, it's ignored entirely. From 7d1eee4a3e190455c9de3cee0d26948e4fe0b640 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 12 Jan 2023 14:23:42 +1000 Subject: [PATCH 114/163] terraform-providers.pass: remove meta.broken --- .../networking/cluster/terraform-providers/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index bba4222adb31..106a60c89ba9 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -77,7 +77,6 @@ let # These are the providers that don't fall in line with the default model special-providers = { - pass = automated-providers.pass.overrideAttrs (o: { meta = o.meta // { broken = stdenv.isDarwin; }; }); tencentcloud = automated-providers.tencentcloud.overrideAttrs (o: { meta = o.meta // { broken = stdenv.isDarwin; }; }); # github api seems to be broken, doesn't just fail to recognize the license, it's ignored entirely. checkly = automated-providers.checkly.override { spdx = "MIT"; }; From d16a369880c94977aaf41b1e92eedcc9b80f11ea Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 12 Jan 2023 14:24:00 +1000 Subject: [PATCH 115/163] terraform-providers.tencentcloud: remove meta.broken --- .../networking/cluster/terraform-providers/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index 106a60c89ba9..07e5b7e3787b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -77,7 +77,6 @@ let # These are the providers that don't fall in line with the default model special-providers = { - tencentcloud = automated-providers.tencentcloud.overrideAttrs (o: { meta = o.meta // { broken = stdenv.isDarwin; }; }); # github api seems to be broken, doesn't just fail to recognize the license, it's ignored entirely. checkly = automated-providers.checkly.override { spdx = "MIT"; }; gitlab = automated-providers.gitlab.override { mkProviderFetcher = fetchFromGitLab; owner = "gitlab-org"; }; From 91f334c3dcfb9bf88c09dcf012b350a9cc598271 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 5 Jan 2023 09:46:47 +0100 Subject: [PATCH 116/163] ocamlPackages.ocsigen_server: use dune 3 --- pkgs/development/ocaml-modules/ocsigen-server/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix index 6097194d2756..3ee300a5a964 100644 --- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix @@ -20,7 +20,7 @@ buildDunePackage rec { version = "5.0.1"; pname = "ocsigenserver"; - useDune2 = true; + duneVersion = "3"; minimalOCamlVersion = "4.08"; src = fetchFromGitHub { From 4b7da5f3bee55c266f90483978c039ea441c7a48 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 5 Jan 2023 09:47:04 +0100 Subject: [PATCH 117/163] ocamlPackages.google-drive-ocamlfuse: use dune 3 --- .../networking/google-drive-ocamlfuse/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix index a61458155d0c..2367f847d107 100644 --- a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix +++ b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix @@ -1,12 +1,13 @@ { lib, buildDunePackage, fetchFromGitHub , extlib, ocamlfuse, gapi-ocaml, ocaml_sqlite3 , tiny_httpd -, ounit +, ounit2 }: buildDunePackage rec { pname = "google-drive-ocamlfuse"; version = "0.7.30"; + duneVersion = "3"; src = fetchFromGitHub { owner = "astrada"; @@ -16,7 +17,7 @@ buildDunePackage rec { }; doCheck = true; - checkInputs = [ ounit ]; + checkInputs = [ ounit2 ]; buildInputs = [ extlib ocamlfuse gapi-ocaml ocaml_sqlite3 tiny_httpd ]; From 6b4546dfc222d9449999378b729549942b6c7dac Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 5 Jan 2023 09:47:20 +0100 Subject: [PATCH 118/163] ocamlPackages.gapi-ocaml: use dune 3 --- pkgs/development/ocaml-modules/gapi-ocaml/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix index f9e566eb0494..837a481cf1bd 100644 --- a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix +++ b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix @@ -6,8 +6,9 @@ buildDunePackage rec { pname = "gapi-ocaml"; version = "0.4.3"; + duneVersion = "3"; - minimalOCamlVersion = "4.02"; + minimalOCamlVersion = "4.08"; src = fetchFromGitHub { owner = "astrada"; @@ -18,7 +19,7 @@ buildDunePackage rec { propagatedBuildInputs = [ cryptokit ocamlnet ocurl yojson ]; - doCheck = lib.versionAtLeast ocaml.version "4.04"; + doCheck = true; checkInputs = [ ounit2 ]; meta = { From e21396d81c9f596e47559ff9ed76098325e2d19b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 5 Jan 2023 09:47:23 +0100 Subject: [PATCH 119/163] ocamlPackages.async_smtp: use dune 3 --- pkgs/development/ocaml-modules/janestreet/0.14.nix | 1 + pkgs/development/ocaml-modules/janestreet/0.15.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/ocaml-modules/janestreet/0.14.nix b/pkgs/development/ocaml-modules/janestreet/0.14.nix index 8a640437bcaf..ae3d4d6b624e 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.14.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.14.nix @@ -120,6 +120,7 @@ with self; }; async_smtp = janePackage { + duneVersion = "3"; pname = "async_smtp"; hash = "1xf3illn7vikdxldpnc29n4z8sv9f0wsdgdvl4iv93qlvjk8gzck"; meta.description = "SMTP client and server"; diff --git a/pkgs/development/ocaml-modules/janestreet/0.15.nix b/pkgs/development/ocaml-modules/janestreet/0.15.nix index 83a52c9b23bb..ed9de3930796 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.15.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.15.nix @@ -131,6 +131,7 @@ with self; }; async_smtp = janePackage { + duneVersion = "3"; pname = "async_smtp"; hash = "1m00j7wcb0blipnc1m6by70gd96a1k621b4dgvgffp8as04a461r"; minimumOCamlVersion = "4.12"; From 6bda65e481d43385d67b5b0687695c50897e9a71 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 5 Jan 2023 09:47:27 +0100 Subject: [PATCH 120/163] ocamlPackages.email_message: use dune 3 --- pkgs/development/ocaml-modules/janestreet/0.14.nix | 1 + pkgs/development/ocaml-modules/janestreet/0.15.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/ocaml-modules/janestreet/0.14.nix b/pkgs/development/ocaml-modules/janestreet/0.14.nix index ae3d4d6b624e..0a93fc6f12e5 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.14.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.14.nix @@ -273,6 +273,7 @@ with self; }; email_message = janePackage { + duneVersion = "3"; pname = "email_message"; hash = "0k8hjkq91ikl7wjxs04k523jbkhl6q4abj6v0lzlbjiybmrpp69n"; meta.description = "E-mail message parser"; diff --git a/pkgs/development/ocaml-modules/janestreet/0.15.nix b/pkgs/development/ocaml-modules/janestreet/0.15.nix index ed9de3930796..d03f8cfdcd7d 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.15.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.15.nix @@ -318,6 +318,7 @@ with self; }; email_message = janePackage { + duneVersion = "3"; pname = "email_message"; hash = "00h66l2g5rjaay0hbyqy4v9i866g779miriwv20h9k4mliqdq7in"; meta.description = "E-mail message parser"; From 481df0c2649e7334ddf60fad75c492c23f24c47c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 5 Jan 2023 09:47:31 +0100 Subject: [PATCH 121/163] ocamlPackages.async_rpc_websocket: use dune 3 --- pkgs/development/ocaml-modules/janestreet/0.15.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/ocaml-modules/janestreet/0.15.nix b/pkgs/development/ocaml-modules/janestreet/0.15.nix index d03f8cfdcd7d..e94385da6711 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.15.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.15.nix @@ -110,6 +110,7 @@ with self; }; async_rpc_websocket = janePackage { + duneVersion = "3"; pname = "async_rpc_websocket"; hash = "1n93jhkz5r76xcc40c4i4sxcyfz1dbppz8sjfxpwcwjyi6lyhp1p"; meta.description = "Library to serve and dispatch Async RPCs over websockets"; From d75e38bb6ebde568ff9a58dae518f032a41f0fbc Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 5 Jan 2023 09:47:35 +0100 Subject: [PATCH 122/163] ocamlPackages.cohttp_async_websocket: use dune 3 --- pkgs/development/ocaml-modules/janestreet/0.15.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/ocaml-modules/janestreet/0.15.nix b/pkgs/development/ocaml-modules/janestreet/0.15.nix index e94385da6711..e5422f3a925d 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.15.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.15.nix @@ -245,6 +245,7 @@ with self; }; cohttp_async_websocket = janePackage { + duneVersion = "3"; pname = "cohttp_async_websocket"; hash = "0d0smavnxpnwrmhlcf3b5a3cm3n9kz1y8fh6l28xv6zrn4sc7ik8"; meta.description = "Websocket library for use with cohttp and async"; From 7bab58ecd1322f294dea62c07b84ddbc24a9b379 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 5 Jan 2023 09:47:39 +0100 Subject: [PATCH 123/163] ocamlPackages.async_websocket: use dune 3 --- pkgs/development/ocaml-modules/janestreet/0.15.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/ocaml-modules/janestreet/0.15.nix b/pkgs/development/ocaml-modules/janestreet/0.15.nix index e5422f3a925d..183a3ff43458 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.15.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.15.nix @@ -161,6 +161,7 @@ with self; }; async_websocket = janePackage { + duneVersion = "3"; pname = "async_websocket"; hash = "16ixqfnx9jp77bvx11dlzsq0pzfpyiif60hl2q06zncyswky9xgb"; meta.description = "A library that implements the websocket protocol on top of Async"; From 586aea4c8ab1b850d2ecb28ee25720adc8096dee Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 5 Jan 2023 09:47:43 +0100 Subject: [PATCH 124/163] =?UTF-8?q?ocamlPackages.cryptokit:=201.17=20?= =?UTF-8?q?=E2=86=92=201.18?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/cryptokit/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/cryptokit/default.nix b/pkgs/development/ocaml-modules/cryptokit/default.nix index 59ba28be3c3b..eb9fdd85e68d 100644 --- a/pkgs/development/ocaml-modules/cryptokit/default.nix +++ b/pkgs/development/ocaml-modules/cryptokit/default.nix @@ -2,7 +2,8 @@ buildDunePackage rec { pname = "cryptokit"; - version = "1.17"; + version = "1.18"; + duneVersion = "3"; minimalOCamlVersion = "4.08"; @@ -10,7 +11,7 @@ buildDunePackage rec { owner = "xavierleroy"; repo = "cryptokit"; rev = "release${lib.replaceStrings ["."] [""] version}"; - sha256 = "sha256:1xi7kcigxkfridjas2zwldsfc21wi31cgln071sbmv4agh3dqbyw"; + hash = "sha256-8ae8hroCSkp4O5vM/qVOhAnnJJ+uygMYm3ix5ytwtHU="; }; # dont do autotools configuration, but do trigger findlib's preConfigure hook From 6986b50df9466b95a81eaf8020585e2bf2c23f81 Mon Sep 17 00:00:00 2001 From: Raphael Robatsch Date: Thu, 12 Jan 2023 09:45:38 +0100 Subject: [PATCH 125/163] llpp: mark as broken See discussion in #188525 --- pkgs/applications/misc/llpp/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index 7004d0dce34f..b1d3a5c0d6fc 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -51,6 +51,9 @@ stdenv.mkDerivation rec { homepage = "https://repo.or.cz/w/llpp.git"; description = "A MuPDF based PDF pager written in OCaml"; platforms = platforms.linux; + # Project is unmaintained and fails to build: + # link.c:987:27: error: invalid operands to binary >= (have 'fz_location' and 'int') + broken = true; maintainers = with maintainers; [ pSub ]; license = licenses.gpl3; }; From c0d431caff8a561e16be72f2a8919260c03fcd11 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 12 Jan 2023 08:51:03 +0000 Subject: [PATCH 126/163] bazel-remote: 2.3.9 -> 2.4.0 --- .../tools/build-managers/bazel/bazel-remote/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix index 74c9de9f11f3..44da96d5b4b1 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "bazel-remote"; - version = "2.3.9"; + version = "2.4.0"; src = fetchFromGitHub { owner = "buchgr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Z6DCe2rkWnTaxvfhLd+ZGxLw2ldjaSPkPz/zHKzI1fs="; + sha256 = "sha256-aC1I+33jEmgjtidA5CQXpwePsavwlx97abpsc68RkBI="; }; - vendorSha256 = "sha256-BThOF6Kodmq0PqofiS24GffmTFRangrf6Q1SJ7mDVvY="; + vendorHash = "sha256-4vNRtFqtzoDHjDQwPe1/sJNzcCU+b7XHgQ5YqEzNhjI="; doCheck = false; From 64f5e9395c5a9437e887bfed6d30252e8a1228fc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 12 Jan 2023 09:45:12 +0000 Subject: [PATCH 127/163] oh-my-posh: 12.35.2 -> 12.36.0 --- pkgs/development/tools/oh-my-posh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/oh-my-posh/default.nix b/pkgs/development/tools/oh-my-posh/default.nix index 45abd9cd83b4..049eefedbd4b 100644 --- a/pkgs/development/tools/oh-my-posh/default.nix +++ b/pkgs/development/tools/oh-my-posh/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "oh-my-posh"; - version = "12.35.2"; + version = "12.36.0"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-6w8m7AuSEFhoYhjAJMXmwpsYuIMCvTiFKasUnBgYYCM="; + hash = "sha256-T2oxpWAbdoNzRnTzM7Uw8jkiui5l8BypNMMhpr49XQk="; }; vendorHash = "sha256-WiH4qu8DODEhAkxUm6VDcBwFyQO7kNjaiaWPDHCHj9E="; From e5fb482c3a3edb22044606d399e03d25676af9e1 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 12 Jan 2023 04:50:00 -0500 Subject: [PATCH 128/163] oh-my-posh: 12.36.0 -> 13.0.0 https://github.com/JanDeDobbeleer/oh-my-posh/releases/tag/v13.0.0 --- pkgs/development/tools/oh-my-posh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/oh-my-posh/default.nix b/pkgs/development/tools/oh-my-posh/default.nix index 049eefedbd4b..0a69028e6bed 100644 --- a/pkgs/development/tools/oh-my-posh/default.nix +++ b/pkgs/development/tools/oh-my-posh/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "oh-my-posh"; - version = "12.36.0"; + version = "13.0.0"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-T2oxpWAbdoNzRnTzM7Uw8jkiui5l8BypNMMhpr49XQk="; + hash = "sha256-xsB7olfsrcgjxqNPOGiV9umtXoTtaM5E+/LTQEVLzZM="; }; vendorHash = "sha256-WiH4qu8DODEhAkxUm6VDcBwFyQO7kNjaiaWPDHCHj9E="; From e1bfd33a5d94bff36f9f0cd560449a0780ef4693 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 11 Jan 2023 01:25:40 -0800 Subject: [PATCH 129/163] libdeltachat: 1.105.0 -> 1.106.0 https://github.com/deltachat/deltachat-core-rust/blob/1.106.0/CHANGELOG.md --- pkgs/development/libraries/libdeltachat/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index b359ce44b037..b533488e9454 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.105.0"; + version = "1.106.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = version; - hash = "sha256-WdTCMuGlg072j6fNZ1sey8EKL47BsdKh3SQ5a++Y34I="; + hash = "sha256-S53ghVFb1qDI7MVNbc2ZlHqDN4VRBFQJCJg2J+w0erc="; }; patches = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-K1DMQ0FHUbyn/cVHKuTBusve0f5SIq1YuGH3cZYealE="; + hash = "sha256-k4j814Ao7FAyd0w1nH2fuX1cJKjBkhPw0CVZqNU7Hqs="; }; nativeBuildInputs = [ From 51885ecec908a1dbf248b8849c01b66390b23425 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 10 Jan 2023 04:41:45 -0800 Subject: [PATCH 130/163] abcmidi: 2022.12.09 -> 2023.01.08 --- pkgs/tools/audio/abcmidi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index b51100afbfcb..78acccf084c0 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2022.12.09"; + version = "2023.01.08"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - hash = "sha256-sDJBfDH8RgoaFtOvO01jzqbYkGtmDGRQps7axXttYQI="; + hash = "sha256-PUaGjZFMYwG9BduIgmzhi5DTkGfSN9VtAUkqrAZ2xbo="; }; meta = with lib; { From 9faffb2f40174c21f6804418961c5b3965b438ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 10 Jan 2023 04:44:16 -0800 Subject: [PATCH 131/163] python310Packages.blebox-uniapi: 2.1.3 -> 2.1.4 https://github.com/blebox/blebox_uniapi/releases/tag/v2.1.4 --- pkgs/development/python-modules/blebox-uniapi/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/blebox-uniapi/default.nix b/pkgs/development/python-modules/blebox-uniapi/default.nix index 92ea182ccc5c..aac60e31bbdf 100644 --- a/pkgs/development/python-modules/blebox-uniapi/default.nix +++ b/pkgs/development/python-modules/blebox-uniapi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "blebox-uniapi"; - version = "2.1.3"; + version = "2.1.4"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "blebox"; repo = "blebox_uniapi"; rev = "refs/tags/v${version}"; - hash = "sha256-rgZ/nHihhPZnc8LLtsrAXDCQT1XaXOnI7xBid+6khfs="; + hash = "sha256-hr3HD8UiI+bKiHcXGnyomJMzP+/GVXLgSUxeH2U6l/4="; }; postPatch = '' @@ -46,6 +46,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/blebox/blebox_uniapi/blob/${src.rev}/HISTORY.rst"; description = "Python API for accessing BleBox smart home devices"; homepage = "https://github.com/blebox/blebox_uniapi"; license = licenses.asl20; From f7791a9f7f42d61e1227524ae245aa02ee286910 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 12 Jan 2023 11:35:51 +0000 Subject: [PATCH 132/163] python310Packages.google-cloud-language: 2.7.0 -> 2.8.0 --- .../python-modules/google-cloud-language/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-language/default.nix b/pkgs/development/python-modules/google-cloud-language/default.nix index 21db9ecf9dfb..7eb18967031e 100644 --- a/pkgs/development/python-modules/google-cloud-language/default.nix +++ b/pkgs/development/python-modules/google-cloud-language/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "google-cloud-language"; - version = "2.7.0"; + version = "2.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2BVkbQt6y9WGLjFBCt4pXPtGcmcsF8FxThOUIu7CgR8="; + hash = "sha256-LEExcED6vlv2Lhto+KyLiz8uyDTa+rHLySUNDZpHGe4="; }; propagatedBuildInputs = [ From f5b1e9334fdb0b3a5cfbc2c06ef5ed91a07c8de0 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 12 Jan 2023 12:44:27 +0100 Subject: [PATCH 133/163] haskellPackages: mark builds failing on hydra as broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh based on *evaluation [1789098](https://hydra.nixos.org/eval/1789098) of nixpkgs commit [57c6af2](https://github.com/NixOS/nixpkgs/commits/57c6af2b888d8e0fff510dc2640f78ee9de36075) as of 2023-01-12 11:40 UTC* from the haskell-updates jobset on hydra under https://hydra.nixos.org/jobset/nixpkgs/haskell-updates --- .../configuration-hackage2nix/broken.yaml | 5 +++++ .../configuration-hackage2nix/transitive-broken.yaml | 10 +++++----- .../development/haskell-modules/hackage-packages.nix | 12 ++++++++++-- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 34be5adc66b2..da69fbb2ecea 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1093,6 +1093,7 @@ broken-packages: - dense - dense-int-set - dependent-hashmap + - dep-t-dynamic - deptrack-core - dep-t-value - derangement @@ -1445,6 +1446,7 @@ broken-packages: - fadno-braids - fadno-xml - failable-list + - FailT - failure-detector - fake - fake-type @@ -4360,6 +4362,7 @@ broken-packages: - record-wrangler - recursors - red-black-record + - redis-glob - redis-hs - redis-simple - Redmine @@ -4904,6 +4907,7 @@ broken-packages: - socket-activation - socketed - socketio + - sockets-and-pipes - socket-sctp - socket-unix - sodium @@ -5819,6 +5823,7 @@ broken-packages: - X11-rm - X11-xdamage - X11-xfixes + - xcffib - xchat-plugin - xcp - x-dsp diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 557efdd9dee5..70a3c7525df4 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -673,10 +673,10 @@ dont-distribute-packages: - array-forth - arraylist - ascii-cows - - ascii-superset_1_2_4_0 + - ascii-superset_1_2_5_0 - ascii-table - - ascii-th_1_1_1_0 - - ascii_1_4_2_0 + - ascii-th_1_2_0_0 + - ascii_1_5_1_0 - asic - asil - assert4hs-hspec @@ -874,7 +874,6 @@ dont-distribute-packages: - bv-sized - bv-sized-lens - bytable - - bytelog - bytepatch - bytestring-builder-varword - bytestring-read @@ -1030,6 +1029,7 @@ dont-distribute-packages: - comark - comfort-array - comfort-array-shape + - comfort-array_0_5_2 - comfort-fftw - comfort-glpk - commsec @@ -3666,7 +3666,6 @@ dont-distribute-packages: - snowflake-server - sock2stream - socket-io - - sockets - socketson - solga-swagger - solr @@ -3821,6 +3820,7 @@ dont-distribute-packages: - synthesizer - synthesizer-alsa - synthesizer-core + - synthesizer-core_0_8_3 - synthesizer-dimensional - synthesizer-filter - synthesizer-llvm diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 4bdef102a901..d52cc75bb1fd 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -6010,6 +6010,8 @@ self: { ]; description = "A 'FailT' monad transformer that plays well with 'MonadFail'"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "FailureT" = callPackage @@ -50678,7 +50680,6 @@ self: { ]; description = "Fast logging"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "byteorder" = callPackage @@ -78314,6 +78315,8 @@ self: { ]; description = "A dynamic environment for dependency injection"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "dep-t-value" = callPackage @@ -238687,6 +238690,8 @@ self: { ]; description = "Specify valid redis globs"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "redis-hs" = callPackage @@ -265520,7 +265525,6 @@ self: { doHaddock = false; description = "High-level network sockets"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "sockets-and-pipes" = callPackage @@ -265542,6 +265546,8 @@ self: { ]; description = "Support for the Sockets and Pipes book"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "socketson" = callPackage @@ -310364,7 +310370,9 @@ self: { ]; description = "A cffi-based python binding for X"; license = "unknown"; + hydraPlatforms = lib.platforms.none; mainProgram = "xcffibgen"; + broken = true; }) {}; "xchat-plugin" = callPackage From 0bd2ffa271eaba1677feeeb6c6ada866127cf65e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 12 Jan 2023 12:06:28 +0000 Subject: [PATCH 134/163] python310Packages.google-cloud-pubsub: 2.13.11 -> 2.13.12 --- .../python-modules/google-cloud-pubsub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix index 83e17cd096b1..26f228ca2a63 100644 --- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "2.13.11"; + version = "2.13.12"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-CFh47PuzmR/qavOgEaot2fVBXRnHYNDemlhSTSqhut4="; + hash = "sha256-/qa/3RKWC0SDgDeax/CwiZtSc9Nxm1cHJAKT6si2ecw="; }; propagatedBuildInputs = [ From f6c2cbab8472b85e27a7d7de05081f093c665ae5 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Mon, 3 Oct 2022 17:18:43 +0800 Subject: [PATCH 135/163] premake5: 5.0.0-alpha12 -> 5.0.0-beta2 Also set ssl certificates --- pkgs/development/tools/misc/premake/5.nix | 14 +++++--- .../tools/misc/premake/no-curl-ca.patch | 36 +++++++++++++++++++ 2 files changed, 45 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/tools/misc/premake/no-curl-ca.patch diff --git a/pkgs/development/tools/misc/premake/5.nix b/pkgs/development/tools/misc/premake/5.nix index bb0269d0cc3b..869fe21ed783 100644 --- a/pkgs/development/tools/misc/premake/5.nix +++ b/pkgs/development/tools/misc/premake/5.nix @@ -1,21 +1,25 @@ -{ lib, stdenv, fetchFromGitHub, Foundation, readline }: +{ lib, stdenv, fetchFromGitHub, libuuid, cacert, Foundation, readline }: with lib; stdenv.mkDerivation rec { pname = "premake5"; - version = "5.0.0-alpha12"; + version = "5.0.0-beta2"; src = fetchFromGitHub { owner = "premake"; repo = "premake-core"; rev = "v${version}"; - sha256 = "1h3hr96pdz94njn4bg02ldcz0k5j1x017d8svc7fdyvl2b77nqzf"; + sha256 = "sha256-2R5gq4jaQsp8Ny1oGuIYkef0kn2UG9jMf20vq0714oY="; }; - buildInputs = optionals stdenv.isDarwin [ Foundation readline ]; + buildInputs = [ libuuid ] ++ optionals stdenv.isDarwin [ Foundation readline ]; - patchPhase = optional stdenv.isDarwin '' + patches = [ ./no-curl-ca.patch ]; + patchPhase = '' + substituteInPlace contrib/curl/premake5.lua \ + --replace "ca = nil" "ca = '${cacert}/etc/ssl/certs/ca-bundle.crt'" + '' + optionalString stdenv.isDarwin '' substituteInPlace premake5.lua \ --replace -mmacosx-version-min=10.4 -mmacosx-version-min=10.5 ''; diff --git a/pkgs/development/tools/misc/premake/no-curl-ca.patch b/pkgs/development/tools/misc/premake/no-curl-ca.patch new file mode 100644 index 000000000000..a1c9c1cfa18e --- /dev/null +++ b/pkgs/development/tools/misc/premake/no-curl-ca.patch @@ -0,0 +1,36 @@ +From a26e36d55cd2447488e01b2ff4ac65e2596862cd Mon Sep 17 00:00:00 2001 +From: Ellie Hermaszewska +Date: Mon, 3 Oct 2022 16:50:33 +0800 +Subject: [PATCH] Do not set CURL_CA_BUNDLE + +--- + contrib/curl/premake5.lua | 13 ------------- + 1 file changed, 13 deletions(-) + +diff --git a/contrib/curl/premake5.lua b/contrib/curl/premake5.lua +index 474f5cfa..553bbd02 100644 +--- a/contrib/curl/premake5.lua ++++ b/contrib/curl/premake5.lua +@@ -32,19 +32,6 @@ project "curl-lib" + + -- find the location of the ca bundle + local ca = nil +- for _, f in ipairs { +- "/etc/ssl/certs/ca-certificates.crt", +- "/etc/pki/tls/certs/ca-bundle.crt", +- "/usr/share/ssl/certs/ca-bundle.crt", +- "/usr/local/share/certs/ca-root.crt", +- "/usr/local/share/certs/ca-root-nss.crt", +- "/etc/certs/ca-certificates.crt", +- "/etc/ssl/cert.pem" } do +- if os.isfile(f) then +- ca = f +- break +- end +- end + if ca then + defines { 'CURL_CA_BUNDLE="' .. ca .. '"' } + end +-- +2.37.2 + From 92f9580a4c369b4b51a7b6a5e77da43720134c9f Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Thu, 12 Jan 2023 11:14:09 +0800 Subject: [PATCH 136/163] premake5: mark broken on darwin aarch64 --- pkgs/development/tools/misc/premake/5.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/misc/premake/5.nix b/pkgs/development/tools/misc/premake/5.nix index 869fe21ed783..3c7dc14327ea 100644 --- a/pkgs/development/tools/misc/premake/5.nix +++ b/pkgs/development/tools/misc/premake/5.nix @@ -43,5 +43,6 @@ stdenv.mkDerivation rec { description = "A simple build configuration and project generation tool using lua"; license = lib.licenses.bsd3; platforms = platforms.darwin ++ platforms.linux; + broken = stdenv.isDarwin && stdenv.isAarch64; }; } From d4bdfa0941b7726ef1bbcfdf04d10c8c945cf0ba Mon Sep 17 00:00:00 2001 From: ChaosAttractor <46527539+LostAttractor@users.noreply.github.com> Date: Thu, 12 Jan 2023 21:28:37 +0800 Subject: [PATCH 137/163] qq: 3.0.0-565 -> 3.0.0-571 --- .../networking/instant-messengers/qq/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/qq/default.nix b/pkgs/applications/networking/instant-messengers/qq/default.nix index 42b8a929a213..d74f7a0530c8 100644 --- a/pkgs/applications/networking/instant-messengers/qq/default.nix +++ b/pkgs/applications/networking/instant-messengers/qq/default.nix @@ -20,15 +20,15 @@ }: let - version = "3.0.0-565"; + version = "3.0.0-571"; srcs = { x86_64-linux = fetchurl { - url = "https://dldir1.qq.com/qqfile/qq/QQNT/64bd2578/linuxqq_${version}_amd64.deb"; - sha256 = "sha256-IfBbheVwg4b5PuLX9bzqSuTcElxNaV3tmbGd3v/NkCY="; + url = "https://dldir1.qq.com/qqfile/qq/QQNT/c005c911/linuxqq_${version}_amd64.deb"; + sha256 = "sha256-8KcUhZwgeFzGyrQITWnJUzEPGZOCj0LIHLmRuKqkgmQ="; }; aarch64-linux = fetchurl { - url = "https://dldir1.qq.com/qqfile/qq/QQNT/64bd2578/linuxqq_${version}_arm64.deb"; - sha256 = "sha256-6IlAJdPknaQzOE48sdxb5QbB+ZF1xKstF3ARGHM30GY="; + url = "https://dldir1.qq.com/qqfile/qq/QQNT/c005c911/linuxqq_${version}_arm64.deb"; + sha256 = "sha256-LvE+Pryq4KLu+BFYVrGiTwBdgOrBguPHQd73MMFlfiY="; }; }; src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); From fe1774681f466453dacc98ebd8eee834caa7bde8 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 12 Jan 2023 14:34:23 +0100 Subject: [PATCH 138/163] haskellPackages.sockets: mark as broken Fails to build https://hydra.nixos.org/build/205128495/nixlog/2 --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 + pkgs/development/haskell-modules/hackage-packages.nix | 2 ++ 2 files changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index da69fbb2ecea..22ce6fd8f9e8 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -4907,6 +4907,7 @@ broken-packages: - socket-activation - socketed - socketio + - sockets - sockets-and-pipes - socket-sctp - socket-unix diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index d52cc75bb1fd..175ffe274db0 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -265525,6 +265525,8 @@ self: { doHaddock = false; description = "High-level network sockets"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "sockets-and-pipes" = callPackage From 1eec181eaf51a94971fc9470a1c0bf9abc8c4450 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 12 Jan 2023 13:50:25 +0000 Subject: [PATCH 139/163] ghostie: 0.2.1 -> 0.3.0 --- pkgs/tools/misc/ghostie/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/ghostie/default.nix b/pkgs/tools/misc/ghostie/default.nix index 61143ed7d1bd..40e30b3867f5 100644 --- a/pkgs/tools/misc/ghostie/default.nix +++ b/pkgs/tools/misc/ghostie/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "ghostie"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromGitHub { owner = "attriaayush"; repo = "ghostie"; rev = "v${version}"; - sha256 = "sha256-O05PJa4YFD8+9BOojS7Ti1OYGxaROFKyGT9VJf5V58U="; + sha256 = "sha256-kdDdKI4nJqomA2h370JT180qQ+EkcLaF4NAG+PjydGE="; }; - cargoSha256 = "sha256-YF808suqfeM156KkRGCCtGFsCdgQ4eu6n2P6yAVV7qc="; + cargoHash = "sha256-NI4V3j92OqBk99lDe6hJgaHmGRdEle7prayo2uGF7CE="; nativeBuildInputs = [ pkg-config From ae2732babb9d4295f5c856912645345cb37da97d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 12 Jan 2023 14:45:40 +0000 Subject: [PATCH 140/163] fend: 1.1.3 -> 1.1.4 --- pkgs/tools/misc/fend/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/fend/default.nix b/pkgs/tools/misc/fend/default.nix index ecf2a4bf0e5a..18ffdb71cde4 100644 --- a/pkgs/tools/misc/fend/default.nix +++ b/pkgs/tools/misc/fend/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "fend"; - version = "1.1.3"; + version = "1.1.4"; src = fetchFromGitHub { owner = "printfn"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3A+MxRonN1dhF7PrsGgc6zai1TQ9K8YIyqD0lqa3/EY="; + sha256 = "sha256-jg2rMiFXtN3oLru1gTaTyIo5eBEI23paKJiDV6KZZE4="; }; - cargoSha256 = "sha256-VgueZKMDI35ERQR+V2SFxnUplHFS0LbJlGb/bRXUYWk="; + cargoHash = "sha256-9Gri/EBaUiCpFBL0f132JDD4Zl5v40e8JmlRvm019S4="; nativeBuildInputs = [ pandoc installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; From f7670281600aa3fd46b087dbee7938fd5e680959 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 12 Jan 2023 14:53:34 +0000 Subject: [PATCH 141/163] spaceship-prompt: 4.12.0 -> 4.13.1 --- pkgs/shells/zsh/spaceship-prompt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/zsh/spaceship-prompt/default.nix b/pkgs/shells/zsh/spaceship-prompt/default.nix index 1328020d96d4..8956b54932a8 100644 --- a/pkgs/shells/zsh/spaceship-prompt/default.nix +++ b/pkgs/shells/zsh/spaceship-prompt/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "spaceship-prompt"; - version = "4.12.0"; + version = "4.13.1"; src = fetchFromGitHub { owner = "denysdovhan"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZL6z5pj2xbnUZl4SK7wxiJjheUY79hwDNVYm9+biKZU="; + sha256 = "sha256-NGm5uM85ThVBSnwMF//drr4GBiYv5JXZU6ZmbjQ2fLU="; }; strictDeps = true; From b2aae06ba1fb6ff329e48d8d9d05b87e9e1845e0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 12 Jan 2023 16:11:14 +0000 Subject: [PATCH 142/163] n8n: 0.210.1 -> 0.210.2 --- .../networking/n8n/node-packages.nix | 311 +++++++++--------- 1 file changed, 161 insertions(+), 150 deletions(-) diff --git a/pkgs/applications/networking/n8n/node-packages.nix b/pkgs/applications/networking/n8n/node-packages.nix index f7bed486d9bd..9fdf76bec2ba 100644 --- a/pkgs/applications/networking/n8n/node-packages.nix +++ b/pkgs/applications/networking/n8n/node-packages.nix @@ -67,13 +67,13 @@ let sha512 = "ZN9avruqbQ5TxopzG3ih3KRy52n8OAbitX3fnZT5go4hzu0J+KVPSzkL+Wt3hpJpdG8WIfg1sBD1tWkgUdEpBA=="; }; }; - "@azure/core-lro-2.4.0" = { + "@azure/core-lro-2.5.0" = { name = "_at_azure_slash_core-lro"; packageName = "@azure/core-lro"; - version = "2.4.0"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.4.0.tgz"; - sha512 = "F65+rYkll1dpw3RGm8/SSiSj+/QkMeYDanzS/QKlM1dmuneVyXbO46C88V1MRHluLGdMP6qfD3vDRYALn0z0tQ=="; + url = "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.5.0.tgz"; + sha512 = "Vsd5Sl04RG/p5ui/p0dAFMov5I/W4dmRjOrtWGXVs4vY/hNMPefiFH7cZEOr+1u0XrBKkpvt634IyUUD9bVRuQ=="; }; }; "@azure/core-paging-1.4.0" = { @@ -175,13 +175,13 @@ let sha512 = "UA/8dgLy3+ZiwJjAZHxL4MUB14fFQPkaAOZ94jsTW/Z6WmoOeny2+cLk0+dyIX/iH6qSrEWKwbStEeB970B9pA=="; }; }; - "@azure/msal-browser-2.32.1" = { + "@azure/msal-browser-2.32.2" = { name = "_at_azure_slash_msal-browser"; packageName = "@azure/msal-browser"; - version = "2.32.1"; + version = "2.32.2"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.32.1.tgz"; - sha512 = "2G3B12ZEIpiimi6/Yqq7KLk4ud1zZWoHvVd2kJ2VthN1HjMsZjdMUxeHkwMWaQ6RzO6mv9rZiuKmRX64xkXW9g=="; + url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.32.2.tgz"; + sha512 = "1YqGzXtPG3QrZPFBKaMWr2WQdukDj+PelqUCv351+p+hlw/AhdRrb8haY73/iqkhT6Cdrbnh7sL4gikVsF4O1g=="; }; }; "@azure/msal-common-7.6.0" = { @@ -193,22 +193,22 @@ let sha512 = "XqfbglUTVLdkHQ8F9UQJtKseRr3sSnr9ysboxtoswvaMVaEfvyLtMoHv9XdKUfOc0qKGzNgRFd9yRjIWVepl6Q=="; }; }; - "@azure/msal-common-9.0.1" = { + "@azure/msal-common-9.0.2" = { name = "_at_azure_slash_msal-common"; packageName = "@azure/msal-common"; - version = "9.0.1"; + version = "9.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-9.0.1.tgz"; - sha512 = "eNNHIW/cwPTZDWs9KtYgb1X6gtQ+cC+FGX2YN+t4AUVsBdUbqlMTnUs6/c/VBxC2AAGIhgLREuNnO3F66AN2zQ=="; + url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-9.0.2.tgz"; + sha512 = "qzwxuF8kZAp+rNUactMCgJh8fblq9D4lSqrrIxMDzLjgSZtjN32ix7r/HBe8QdOr76II9SVVPcMkX4sPzPfQ7w=="; }; }; - "@azure/msal-node-1.14.5" = { + "@azure/msal-node-1.14.6" = { name = "_at_azure_slash_msal-node"; packageName = "@azure/msal-node"; - version = "1.14.5"; + version = "1.14.6"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.14.5.tgz"; - sha512 = "NcVdMfn8Z3ogN+9RjOSF7uwf2Gki5DEJl0BdDSL83KUAgVAobtkZi5W8EqxbJLrTO/ET0jv5DregrcR5qg2pEA=="; + url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.14.6.tgz"; + sha512 = "em/qqFL5tLMxMPl9vormAs13OgZpmQoJbiQ/GlWr+BA77eCLoL+Ehr5xRHowYo+LFe5b+p+PJVkRvT+mLvOkwA=="; }; }; "@azure/storage-blob-12.12.0" = { @@ -265,13 +265,13 @@ let sha512 = "OcwLfZXdQ1OHrLiIcKCn7MqZ7nx205CMKlhe+vL88pe2ymhT9+2P+QhwkYGxMICj8TDHyp8HFKVwpiisUT7iEQ=="; }; }; - "@codemirror/language-6.3.2" = { + "@codemirror/language-6.4.0" = { name = "_at_codemirror_slash_language"; packageName = "@codemirror/language"; - version = "6.3.2"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@codemirror/language/-/language-6.3.2.tgz"; - sha512 = "g42uHhOcEMAXjmozGG+rdom5UsbyfMxQFh7AbkeoaNImddL6Xt4cQDL0+JxmG7+as18rUAvZaqzP/TjsciVIrA=="; + url = "https://registry.npmjs.org/@codemirror/language/-/language-6.4.0.tgz"; + sha512 = "Wzb7GnNj8vnEtbPWiOy9H0m1fBtE28kepQNGLXekU2EEZv43BF865VKITUn+NoV8OpW6gRtvm29YEhqm46927Q=="; }; }; "@codemirror/lint-6.1.0" = { @@ -292,13 +292,13 @@ let sha512 = "69QXtcrsc3RYtOtd+GsvczJ319udtBf1PTrr2KbLWM/e2CXUPnh0Nz9AUo8WfhSQ7GeL8dPVNUmhQVgpmuaNGA=="; }; }; - "@codemirror/view-6.7.2" = { + "@codemirror/view-6.7.3" = { name = "_at_codemirror_slash_view"; packageName = "@codemirror/view"; - version = "6.7.2"; + version = "6.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/@codemirror/view/-/view-6.7.2.tgz"; - sha512 = "HeK2GyycxceaQVyvYVYXmn1vUKYYBsHCcfGRSsFO+3fRRtwXx2STK0YiFBmiWx2vtU9gUAJgIUXUN8a0osI8Ng=="; + url = "https://registry.npmjs.org/@codemirror/view/-/view-6.7.3.tgz"; + sha512 = "Lt+4POnhXrZFfHOdPzXEHxrzwdy7cjqYlMkOWvoFGi6/bAsjzlFfr0NY3B15B/PGx+cDFgM1hlc12wvYeZbGLw=="; }; }; "@colors/colors-1.5.0" = { @@ -499,22 +499,22 @@ let sha512 = "3vLKLPThO4td43lYRBygmMY18JN3CPh9w+XS2j8WC30vR4yZeFG4z1iFe4jXE43NtGqe//zHW5q8ENLlHvz9gw=="; }; }; - "@lezer/javascript-1.4.0" = { + "@lezer/javascript-1.4.1" = { name = "_at_lezer_slash_javascript"; packageName = "@lezer/javascript"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.0.tgz"; - sha512 = "MQ3oLJGEtpUgZ03LOLI60tDnjSkKO6h9hZSe31qJ1UQV+I9bpv3pwSnPUnX0+e+3E1PBVkox0GB2/MXkxg0M2w=="; + url = "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.1.tgz"; + sha512 = "Hqx36DJeYhKtdpc7wBYPR0XF56ZzIp0IkMO/zNNj80xcaFOV4Oj/P7TQc/8k2TxNhzl7tV5tXS8ZOCPbT4L3nA=="; }; }; - "@lezer/lr-1.2.5" = { + "@lezer/lr-1.3.0" = { name = "_at_lezer_slash_lr"; packageName = "@lezer/lr"; - version = "1.2.5"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lezer/lr/-/lr-1.2.5.tgz"; - sha512 = "f9319YG1A/3ysgUE3bqCHEd7g+3ZZ71MWlwEc42mpnLVYXgfJJgtu1XAyBB4Kz8FmqmnFe9caopDqKeMMMAU6g=="; + url = "https://registry.npmjs.org/@lezer/lr/-/lr-1.3.0.tgz"; + sha512 = "rpvS+WPS/PlbJCiW+bzXPbIFIRXmzRiTEDzMvrvgpED05w5ZQO59AzH3BJen2AnHuJIlP3DcJRjsKLTrkknUNA=="; }; }; "@mapbox/node-pre-gyp-1.0.10" = { @@ -607,13 +607,13 @@ let sha512 = "OWhCpdu4QqggOPX1YPZ4XVmLLRX+lhGjXV6RNA7sogOwLqlEmSslnN/lhR5dkhcWZbKWBQH29YCrB3LDPRu/IA=="; }; }; - "@oclif/core-1.23.2" = { + "@oclif/core-1.24.0" = { name = "_at_oclif_slash_core"; packageName = "@oclif/core"; - version = "1.23.2"; + version = "1.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/core/-/core-1.23.2.tgz"; - sha512 = "NdaOaUDTRc6g1yTkOAKiEVOiQhc5CNcWNXa0QF4IS4yTjNqp4DOzgtF9Dwe585nPEKzSbTBiz1wyLOa4qIHSRQ=="; + url = "https://registry.npmjs.org/@oclif/core/-/core-1.24.0.tgz"; + sha512 = "J41suyV4fLfLcRRySZdtgFYSjIlpYqD90SY01Fm4+ZJUMcfDh/eQAD4sogyYOsIT0bfEzYOyYCjmfHmgcoX5aA=="; }; }; "@oclif/errors-1.3.6" = { @@ -661,13 +661,13 @@ let sha512 = "IMsTN1dXEXaOSre27j/ywGbBjrzx0FNd1XmuhCWCB9NTPrhWI1Ifbz+YLSEcstfQfocYsrbrIessxXb2oon4lA=="; }; }; - "@opentelemetry/api-1.3.0" = { + "@opentelemetry/api-1.4.0" = { name = "_at_opentelemetry_slash_api"; packageName = "@opentelemetry/api"; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/api/-/api-1.3.0.tgz"; - sha512 = "YveTnGNsFFixTKJz09Oi4zYkiLT5af3WpZDu4aIUM7xX+2bHAkOJayFTVQd6zB8kkWPpbua4Ha6Ql00grdLlJQ=="; + url = "https://registry.npmjs.org/@opentelemetry/api/-/api-1.4.0.tgz"; + sha512 = "IgMK9i3sFGNUqPMbjABm0G26g0QCKCUBfglhQ7rQq6WcxbKfEHRcmwsoER4hZcuYqJgkYn2OeuoJIv7Jsftp7g=="; }; }; "@rudderstack/rudder-sdk-node-1.0.6" = { @@ -706,49 +706,49 @@ let sha512 = "gW69MEamZ4wk1OsOq1nG1jcyhXIQcnrsX5JwixVw/9xaiav8TCyjESAruu1Rz9yyInhgBXxkNwMeygKnN2uxNA=="; }; }; - "@sentry/core-7.29.0" = { + "@sentry/core-7.30.0" = { name = "_at_sentry_slash_core"; packageName = "@sentry/core"; - version = "7.29.0"; + version = "7.30.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/core/-/core-7.29.0.tgz"; - sha512 = "+e9aIp2ljtT4EJq3901z6TfEVEeqZd5cWzbKEuQzPn2UO6If9+Utd7kY2Y31eQYb4QnJgZfiIEz1HonuYY6zqQ=="; + url = "https://registry.npmjs.org/@sentry/core/-/core-7.30.0.tgz"; + sha512 = "NeLigkBlpcK63ymM63GoIHurml6V3BUe1Vi+trwm4/qqOTzT7PQhvdJCX+o3+atzRBH+zdb6kd4VWx44Oye3KA=="; }; }; - "@sentry/integrations-7.29.0" = { + "@sentry/integrations-7.30.0" = { name = "_at_sentry_slash_integrations"; packageName = "@sentry/integrations"; - version = "7.29.0"; + version = "7.30.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.29.0.tgz"; - sha512 = "BkZe3ALij320VtC5bNkeSz3OUhT9oxZsj2lf5rCuRFqcqw4tvVNADF/Y98mf0L4VCy582M9MlNXmwfewJjxGOA=="; + url = "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.30.0.tgz"; + sha512 = "KU8TnJm1Yldxnhdu/EZcIGXU9ptGQPk6ot4smcNx/mKsy575VrDdyVDx8uIYURWyfsg7eOayt6VdC7ISSODp8A=="; }; }; - "@sentry/node-7.29.0" = { + "@sentry/node-7.30.0" = { name = "_at_sentry_slash_node"; packageName = "@sentry/node"; - version = "7.29.0"; + version = "7.30.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/node/-/node-7.29.0.tgz"; - sha512 = "s/bN/JS5gPTmwzVms4FtI5YNYtC9aGY4uqdx/llVrIiVv7G6md/oJJzKtO1C4dt6YshjGjSs5KCpEn1NM4+1iA=="; + url = "https://registry.npmjs.org/@sentry/node/-/node-7.30.0.tgz"; + sha512 = "YYasu6C3I0HBP4N1oc/ed2nunxhGJgtAWaKwq3lo8uk3uF6cB1A8+2e0CpjzU5ejhbaFPUBxHyj4th39Bvku/w=="; }; }; - "@sentry/types-7.29.0" = { + "@sentry/types-7.30.0" = { name = "_at_sentry_slash_types"; packageName = "@sentry/types"; - version = "7.29.0"; + version = "7.30.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/types/-/types-7.29.0.tgz"; - sha512 = "DmoEpoqHPty3VxqubS/5gxarwebHRlcBd/yuno+PS3xy++/i9YPjOWLZhU2jYs1cW68M9R6CcCOiC9f2ckJjdw=="; + url = "https://registry.npmjs.org/@sentry/types/-/types-7.30.0.tgz"; + sha512 = "l4A86typvt/SfWh5JffpdxNGkg5EEA8m35BzpIcKmCAQZUDmnb4b478r8jdD2uuOjLmPNmZr1tifdRW4NCLuxQ=="; }; }; - "@sentry/utils-7.29.0" = { + "@sentry/utils-7.30.0" = { name = "_at_sentry_slash_utils"; packageName = "@sentry/utils"; - version = "7.29.0"; + version = "7.30.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.29.0.tgz"; - sha512 = "ICcBwTiBGK8NQA8H2BJo0JcMN6yCeKLqNKNMVampRgS6wSfSk1edvcTdhRkW3bSktIGrIPZrKskBHyMwDGF2XQ=="; + url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.30.0.tgz"; + sha512 = "tSlBhr5u/LdE2emxIDTDmjmyRr99GnZGIAh5GwRxUgeDQ3VEfNUFlyFodBCbZ6yeYTYd6PWNih5xoHn1+Rf3Sw=="; }; }; "@servie/events-1.0.0" = { @@ -1498,13 +1498,13 @@ let sha512 = "9cYNccliXZDByFsFliVwk5GvTq058Fj513CiR4E60ndDwmuXzTJEp/Bp8FyuRmGyYupLjHLs+JA9/CBoVS4/NQ=="; }; }; - "aws-sdk-2.1290.0" = { + "aws-sdk-2.1293.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1290.0"; + version = "2.1293.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1290.0.tgz"; - sha512 = "qRrXLgK4FpkdxeagjrHuhtEEvYrvRbddTBg1I7KBuMCIhXHzSS3nEUmdZjdyMuQJEvt0BCJjwVkNh8e/5TauDQ=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1293.0.tgz"; + sha512 = "Wq4zPwJsrYLerXkWzllrTky3DM/Gwg8rKmC/79cDckGzDT8vZ2w/JfI5lW94ckRHjbqQXalChMH3GmWp0sV29Q=="; }; }; "aws-sign2-0.7.0" = { @@ -1813,13 +1813,13 @@ let sha512 = "EvVNVeGo4tHxwi8L6bPj3y3itEvStdwvvlojVxxbyYfoaxJ6keLgrTuKdyfEAszFK+H3olzBuafE0yoh0D1gdg=="; }; }; - "bson-4.7.1" = { + "bson-4.7.2" = { name = "bson"; packageName = "bson"; - version = "4.7.1"; + version = "4.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/bson/-/bson-4.7.1.tgz"; - sha512 = "XkuFtlCzi0WSy8D6PMhvrQ/q8VlZHN/2bJ/shJglwuA6TPD2ZP/hHLB7iDxOEWVINHN/UVTxP4pqZqOKMXPIXg=="; + url = "https://registry.npmjs.org/bson/-/bson-4.7.2.tgz"; + sha512 = "Ry9wCtIZ5kGqkJoi6aD8KjxFZEx78guTQDnpXWiNthsxzrxAK/i8E6pCHAIZTbaEFWcOCvbecMukfK7XUvyLpQ=="; }; }; "buffer-4.9.2" = { @@ -2623,13 +2623,13 @@ let sha512 = "s4odpheTyydAbTBQepsqd2rNWGa2iV3cyo8g7zbI2QQYGLVsfbhmwukayS1XHppe02Oy1fg7mg6xoaraVJeEcg=="; }; }; - "cron-parser-4.7.0" = { + "cron-parser-4.7.1" = { name = "cron-parser"; packageName = "cron-parser"; - version = "4.7.0"; + version = "4.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/cron-parser/-/cron-parser-4.7.0.tgz"; - sha512 = "BdAELR+MCT2ZWsIBhZKDuUqIUCBjHHulPJnm53OfdRLA4EWBjva3R+KM5NeidJuGsNXdEcZkjC7SCnkW5rAFSA=="; + url = "https://registry.npmjs.org/cron-parser/-/cron-parser-4.7.1.tgz"; + sha512 = "WguFaoQ0hQ61SgsCZLHUcNbAvlK0lypKXu62ARguefYmjzaOXIVRNrAmyXzabTwUn4sQvQLkk6bjH+ipGfw8bA=="; }; }; "cross-spawn-4.0.2" = { @@ -3289,13 +3289,13 @@ let sha512 = "2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA=="; }; }; - "es-abstract-1.21.0" = { + "es-abstract-1.21.1" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.21.0"; + version = "1.21.1"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.0.tgz"; - sha512 = "GUGtW7eXQay0c+PRq0sGIKSdaBorfVqsCMhGHo4elP7YVqZu9nCZS4UkK4gv71gOWNMra/PaSKD3ao1oWExO0g=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.1.tgz"; + sha512 = "QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg=="; }; }; "es-aggregate-error-1.0.9" = { @@ -5404,13 +5404,13 @@ let sha512 = "X2U5Wx0YmK0rXFbk67ASMeqYIkZ6E5vY7pNWRKtnNzqjvdYYG8xtPDpCnuUEnPU9vlgNev+JoSrcaKSUaNvfsw=="; }; }; - "libphonenumber-js-1.10.16" = { + "libphonenumber-js-1.10.18" = { name = "libphonenumber-js"; packageName = "libphonenumber-js"; - version = "1.10.16"; + version = "1.10.18"; src = fetchurl { - url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.16.tgz"; - sha512 = "ga6F+8WSmMprzIKvRoeL/iAvkZWSdEpYCDISnXIiQTXw7sezfk+J9IHwzjK3b+6QvyZK8Gjjzjl3Hp+B5lpUXg=="; + url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.18.tgz"; + sha512 = "NS4ZEgNhwbcPz1gfSXCGFnQm0xEiyTSPRthIuWytDzOiEG9xnZ2FbLyfJC4tI2BMAAXpoWbNxHYH75pa3Dq9og=="; }; }; "libpq-1.8.12" = { @@ -5818,15 +5818,6 @@ let sha512 = "uQw9OqphAGiZhkuPlpFGmdTU2tEuhxTourM/19qGJrxBPHAr/f8BT1a0i/lOclESnGatdJG/UCkP9kZB/Lh1iw=="; }; }; - "lru-cache-4.1.5" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "4.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz"; - sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g=="; - }; - }; "lru-cache-5.1.1" = { name = "lru-cache"; packageName = "lru-cache"; @@ -5845,6 +5836,15 @@ let sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; }; }; + "lru-cache-7.14.1" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "7.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-7.14.1.tgz"; + sha512 = "ysxwsnTKdAx96aTRdhDOCQfDgbHnt8SK0KY8SEjO0wHinhWOFTESbjVCMPbU1uGXg/ch4lifqx0wfjOawU2+WA=="; + }; + }; "lru-memoizer-2.1.4" = { name = "lru-memoizer"; packageName = "lru-memoizer"; @@ -6430,13 +6430,13 @@ let sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="; }; }; - "n8n-core-0.150.0" = { + "n8n-core-0.150.1" = { name = "n8n-core"; packageName = "n8n-core"; - version = "0.150.0"; + version = "0.150.1"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.150.0.tgz"; - sha512 = "nSPvZWo1crZoNIDhzqvJbYN1P+EMYKAy10FGxLHu7w2AMBD3IFdVWT1JlYNBMW9aO4NSs0i/Q0NBrA/krSbhoA=="; + url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.150.1.tgz"; + sha512 = "75S8iJuy2TaxcBO82Pi72tprlKzJa57k1QOoxU34rCKAGfUVzBrmx8qbI+V/2oVAFmcsByp5s8XCbGrOkj8Z2Q=="; }; }; "n8n-design-system-0.50.1" = { @@ -6448,40 +6448,40 @@ let sha512 = "v7eVGosiF2K6aboKS8cydyS+3Brj118iDlAmkgvyla8QT5QV3PBtNEluuCIH8ySdTOGs3TtWzGXSNTdpTZ+rqg=="; }; }; - "n8n-editor-ui-0.176.1" = { + "n8n-editor-ui-0.176.2" = { name = "n8n-editor-ui"; packageName = "n8n-editor-ui"; - version = "0.176.1"; + version = "0.176.2"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.176.1.tgz"; - sha512 = "ySWUKs096wybHDvoFcxKuR3uX5JHwPMWJUwzNFRpN4+bhy7a2SKkA8QAfeWIBPybgng6GgTA6IqPWbZ7LZ+xYQ=="; + url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.176.2.tgz"; + sha512 = "amkHuLTMiBwUwHQbC31NIdhmizIVgXvw2yztiSqvdbFHNmuJG05QcQAeFexK+JA3HBx+RWKAWUsvSMc9Nw53rw=="; }; }; - "n8n-nodes-base-0.208.1" = { + "n8n-nodes-base-0.208.2" = { name = "n8n-nodes-base"; packageName = "n8n-nodes-base"; - version = "0.208.1"; + version = "0.208.2"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.208.1.tgz"; - sha512 = "uGx2g5xrh6WZ1u8TzyiGHQt4v52LhULLmN6WGOS57Jg658FYiMfWe7soR1iEMTWk/FD2DPQNvoJptGqN7TLlCQ=="; + url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.208.2.tgz"; + sha512 = "711ujlB9GnKG8Mv0h5Q/ffETZ6CLArO0XSQRAVCqTZEQ8XdhmpWHn/eCHU2bxMEO9y7yy1E3VLL4MDwQaY8d0g=="; }; }; - "n8n-workflow-0.132.0" = { + "n8n-workflow-0.132.1" = { name = "n8n-workflow"; packageName = "n8n-workflow"; - version = "0.132.0"; + version = "0.132.1"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.132.0.tgz"; - sha512 = "DmWxbOV0Z/8VBNVzQz1O5sD0q82DSxFgJvVRnqL8HayALiiLQbNvgniU2BYJz2SSgKzcpkXX4ZIt94CESqD50w=="; + url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.132.1.tgz"; + sha512 = "ksrKfg9hVrVQ5H6jvm7+7YGghVO38VU6ZoaMQWalLfiZHR/W+9l8F3yxdfLX1o8Ewbk0za5dm5tT5E/fc7+Gwg=="; }; }; - "named-placeholders-1.1.2" = { + "named-placeholders-1.1.3" = { name = "named-placeholders"; packageName = "named-placeholders"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/named-placeholders/-/named-placeholders-1.1.2.tgz"; - sha512 = "wiFWqxoLL3PGVReSZpjLVxyJ1bRqe+KKJVbr4hGs1KWfTZTQyezHFBbuKj9hsizHyGV2ne7EMjHdxEGAybD5SA=="; + url = "https://registry.npmjs.org/named-placeholders/-/named-placeholders-1.1.3.tgz"; + sha512 = "eLoBxg6wE/rZkJPhU/xRX1WTpkFEwDJEN96oxFrTsqBdbT5ec295Q+CoHrL9IT0DipqKhmGcaZmwOt8OON5x1w=="; }; }; "nan-2.17.0" = { @@ -6583,13 +6583,13 @@ let sha512 = "fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg=="; }; }; - "node-abi-3.30.0" = { + "node-abi-3.31.0" = { name = "node-abi"; packageName = "node-abi"; - version = "3.30.0"; + version = "3.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-abi/-/node-abi-3.30.0.tgz"; - sha512 = "qWO5l3SCqbwQavymOmtTVuCWZE23++S+rxyoHjXqUmPyzRcaoI4lA2gO55/drddGnedAyjA7sk76SfQ5lfUMnw=="; + url = "https://registry.npmjs.org/node-abi/-/node-abi-3.31.0.tgz"; + sha512 = "eSKV6s+APenqVh8ubJyiu/YhZgxQpGP66ntzUb3lY1xB9ukSRaGnx0AIxI+IM+1+IVYC1oWobgG5L3Lt9ARykQ=="; }; }; "node-abort-controller-3.0.1" = { @@ -6709,6 +6709,15 @@ let sha512 = "EjYvSmHzekz6VNkNd12aUqAco+bOkRe3Of5jVhltqKhEsjw/y0PYPJfp83+s9Wzh1dspYAkUW/YNQ350NATbSQ=="; }; }; + "nodemailer-6.9.0" = { + name = "nodemailer"; + packageName = "nodemailer"; + version = "6.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.0.tgz"; + sha512 = "jFaCEGTeT3E/m/5R2MHWiyQH3pSARECRUDM+1hokOYc3lQAAG7ASuy+2jIsYVf+RVa9zePopSQwKNVFH8DKUpA=="; + }; + }; "nopt-5.0.0" = { name = "nopt"; packageName = "nopt"; @@ -7843,13 +7852,13 @@ let sha512 = "RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw=="; }; }; - "punycode-2.1.1" = { + "punycode-2.2.0" = { name = "punycode"; packageName = "punycode"; - version = "2.1.1"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"; - sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; + url = "https://registry.npmjs.org/punycode/-/punycode-2.2.0.tgz"; + sha512 = "LN6QV1IJ9ZhxWTNdktaPClrNfp8xdSAYS0Zk2ddX7XsXZAxckMHPCBcHRo0cTcEIgYPRiGEkmji3Idkh2yFtYw=="; }; }; "python-struct-1.1.3" = { @@ -10414,10 +10423,10 @@ in n8n = nodeEnv.buildNodePackage { name = "n8n"; packageName = "n8n"; - version = "0.210.1"; + version = "0.210.2"; src = fetchurl { - url = "https://registry.npmjs.org/n8n/-/n8n-0.210.1.tgz"; - sha512 = "mlcpNkl8Nwq1K05rz1BGzoPhaqxsbKOPs4ixr8iueeADfkomsD7ywsRQ6lgHd2GuOGRzXg/upazU/I7exMTj2w=="; + url = "https://registry.npmjs.org/n8n/-/n8n-0.210.2.tgz"; + sha512 = "VLlKjcyQnioWgdfZXN4zoQYGy42x7U2LK8zehx+XsjG6wJhrlYyCKzQpECjYZZhzBCYLCvgEzi+mNbqdLDlX7w=="; }; dependencies = [ (sources."@acuminous/bitsyntax-0.1.2" // { @@ -10455,7 +10464,7 @@ in ]; }) sources."@azure/core-http-compat-1.3.0" - (sources."@azure/core-lro-2.4.0" // { + (sources."@azure/core-lro-2.5.0" // { dependencies = [ sources."tslib-2.4.1" ]; @@ -10507,15 +10516,16 @@ in ]; }) sources."@azure/ms-rest-nodeauth-3.1.1" - (sources."@azure/msal-browser-2.32.1" // { + (sources."@azure/msal-browser-2.32.2" // { dependencies = [ - sources."@azure/msal-common-9.0.1" + sources."@azure/msal-common-9.0.2" ]; }) sources."@azure/msal-common-7.6.0" - (sources."@azure/msal-node-1.14.5" // { + (sources."@azure/msal-node-1.14.6" // { dependencies = [ - sources."@azure/msal-common-9.0.1" + sources."@azure/msal-common-9.0.2" + sources."jsonwebtoken-9.0.0" ]; }) (sources."@azure/storage-blob-12.12.0" // { @@ -10529,10 +10539,10 @@ in sources."@codemirror/autocomplete-6.4.0" sources."@codemirror/commands-6.1.3" sources."@codemirror/lang-javascript-6.1.2" - sources."@codemirror/language-6.3.2" + sources."@codemirror/language-6.4.0" sources."@codemirror/lint-6.1.0" sources."@codemirror/state-6.2.0" - sources."@codemirror/view-6.7.2" + sources."@codemirror/view-6.7.3" sources."@colors/colors-1.5.0" sources."@curlconverter/yargs-0.0.2" sources."@curlconverter/yargs-parser-0.0.1" @@ -10567,8 +10577,8 @@ in sources."@kwsites/promise-deferred-1.1.1" sources."@lezer/common-1.0.2" sources."@lezer/highlight-1.1.3" - sources."@lezer/javascript-1.4.0" - sources."@lezer/lr-1.2.5" + sources."@lezer/javascript-1.4.1" + sources."@lezer/lr-1.3.0" sources."@mapbox/node-pre-gyp-1.0.10" (sources."@n8n_io/license-sdk-1.8.0" // { dependencies = [ @@ -10591,7 +10601,7 @@ in sources."tslib-2.4.1" ]; }) - (sources."@oclif/core-1.23.2" // { + (sources."@oclif/core-1.24.0" // { dependencies = [ sources."supports-color-8.1.1" sources."tslib-2.4.1" @@ -10614,7 +10624,7 @@ in ]; }) sources."@oclif/screen-3.0.4" - sources."@opentelemetry/api-1.3.0" + sources."@opentelemetry/api-1.4.0" (sources."@rudderstack/rudder-sdk-node-1.0.6" // { dependencies = [ sources."bull-3.29.3" @@ -10633,11 +10643,11 @@ in sources."domhandler-5.0.3" ]; }) - sources."@sentry/core-7.29.0" - sources."@sentry/integrations-7.29.0" - sources."@sentry/node-7.29.0" - sources."@sentry/types-7.29.0" - sources."@sentry/utils-7.29.0" + sources."@sentry/core-7.30.0" + sources."@sentry/integrations-7.30.0" + sources."@sentry/node-7.30.0" + sources."@sentry/types-7.30.0" + sources."@sentry/utils-7.30.0" sources."@servie/events-1.0.0" sources."@sqltools/formatter-1.2.5" sources."@techteamer/ocsp-1.0.0" @@ -10757,7 +10767,7 @@ in }) sources."available-typed-arrays-1.0.5" sources."avsc-5.7.7" - (sources."aws-sdk-2.1290.0" // { + (sources."aws-sdk-2.1293.0" // { dependencies = [ sources."buffer-4.9.2" sources."events-1.1.1" @@ -10818,7 +10828,7 @@ in sources."brace-expansion-2.0.1" sources."braces-3.0.2" sources."browser-request-0.3.3" - sources."bson-4.7.1" + sources."bson-4.7.2" sources."buffer-5.7.1" sources."buffer-equal-constant-time-1.0.1" sources."buffer-from-1.1.2" @@ -10827,7 +10837,7 @@ in sources."bufferutil-4.0.7" (sources."bull-4.10.2" // { dependencies = [ - sources."cron-parser-4.7.0" + sources."cron-parser-4.7.1" ]; }) sources."busboy-1.6.0" @@ -11016,7 +11026,7 @@ in sources."entities-2.2.0" sources."env-paths-2.2.1" sources."err-code-2.0.3" - sources."es-abstract-1.21.0" + sources."es-abstract-1.21.1" sources."es-aggregate-error-1.0.9" sources."es-array-method-boxes-properly-1.0.0" sources."es-set-tostringtag-2.0.1" @@ -11319,7 +11329,7 @@ in sources."levn-0.3.0" sources."libbase64-1.2.1" sources."libmime-5.2.0" - sources."libphonenumber-js-1.10.16" + sources."libphonenumber-js-1.10.18" sources."libpq-1.8.12" sources."libqp-2.0.1" sources."lie-3.1.1" @@ -11378,6 +11388,7 @@ in (sources."mailparser-3.6.3" // { dependencies = [ sources."linkify-it-4.0.1" + sources."nodemailer-6.8.0" ]; }) sources."mailsplit-5.4.0" @@ -11510,32 +11521,32 @@ in ]; }) sources."mz-2.7.0" - (sources."n8n-core-0.150.0" // { + (sources."n8n-core-0.150.1" // { dependencies = [ sources."concat-stream-2.0.0" sources."readable-stream-3.6.0" ]; }) sources."n8n-design-system-0.50.1" - (sources."n8n-editor-ui-0.176.1" // { + (sources."n8n-editor-ui-0.176.2" // { dependencies = [ sources."luxon-2.5.2" ]; }) - (sources."n8n-nodes-base-0.208.1" // { + (sources."n8n-nodes-base-0.208.2" // { dependencies = [ sources."chokidar-3.5.2" sources."luxon-2.3.2" ]; }) - (sources."n8n-workflow-0.132.0" // { + (sources."n8n-workflow-0.132.1" // { dependencies = [ sources."luxon-2.3.2" ]; }) - (sources."named-placeholders-1.1.2" // { + (sources."named-placeholders-1.1.3" // { dependencies = [ - sources."lru-cache-4.1.5" + sources."lru-cache-7.14.1" ]; }) sources."nan-2.17.0" @@ -11553,7 +11564,7 @@ in sources."tslib-2.4.1" ]; }) - sources."node-abi-3.30.0" + sources."node-abi-3.31.0" sources."node-abort-controller-3.0.1" sources."node-addon-api-4.3.0" sources."node-ensure-0.0.0" @@ -11582,7 +11593,7 @@ in sources."node-rsa-1.1.1" sources."node-ssh-12.0.5" sources."nodeify-1.0.1" - sources."nodemailer-6.8.0" + sources."nodemailer-6.9.0" sources."nopt-5.0.0" sources."normalize-path-3.0.0" sources."normalize-wheel-1.0.1" @@ -11752,7 +11763,7 @@ in sources."pump-2.0.1" ]; }) - sources."punycode-2.1.1" + sources."punycode-2.2.0" sources."python-struct-1.1.3" sources."qs-6.11.0" sources."query-string-7.1.3" From 0f213d0fee84280d8c3a97f7469b988d6fe5fcdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 11 Jan 2023 08:51:40 +0100 Subject: [PATCH 143/163] spyder: remove unneeded extra desktop file I added a desktop file in 2013 (commit 36c6a05fd974194139656f80a3c47f6613418fea) because upstream didn't provide one at the time. Now upstream provide one so let's remove ours. --- .../python-modules/spyder/default.nix | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix index 2a0d74c84f08..80435a738d58 100644 --- a/pkgs/development/python-modules/spyder/default.nix +++ b/pkgs/development/python-modules/spyder/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchPypi , pythonOlder -, makeDesktopItem , atomicwrites , chardet , cloudpickle @@ -105,16 +104,6 @@ buildPythonPackage rec { # There is no test for spyder doCheck = false; - desktopItem = makeDesktopItem { - name = "Spyder"; - exec = "spyder"; - icon = "spyder"; - comment = "Scientific Python Development Environment"; - desktopName = "Spyder"; - genericName = "Python IDE"; - categories = [ "Development" "IDE" ]; - }; - postPatch = '' # Remove dependency on pyqtwebengine # This is still part of the pyqt 5.11 version we have in nixpkgs @@ -128,11 +117,6 @@ buildPythonPackage rec { # Add Python libs to env so Spyder subprocesses # created to run compute kernels don't fail with ImportErrors wrapProgram $out/bin/spyder --prefix PYTHONPATH : "$PYTHONPATH" - - # Create desktop item - mkdir -p $out/share/icons - cp spyder/images/spyder.svg $out/share/icons - cp -r $desktopItem/share/applications/ $out/share ''; dontWrapQtApps = true; From 90a21f4771906aa2bd5729a3a23b151fb9e8c422 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 9 Jan 2023 10:33:56 +0100 Subject: [PATCH 144/163] ocamlPackages.letsencrypt: use dune 3 --- pkgs/development/ocaml-modules/letsencrypt/app.nix | 4 ++-- pkgs/development/ocaml-modules/letsencrypt/default.nix | 6 +++--- pkgs/development/ocaml-modules/letsencrypt/dns.nix | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/ocaml-modules/letsencrypt/app.nix b/pkgs/development/ocaml-modules/letsencrypt/app.nix index 1f6cc6e2b103..b2d8b3c22073 100644 --- a/pkgs/development/ocaml-modules/letsencrypt/app.nix +++ b/pkgs/development/ocaml-modules/letsencrypt/app.nix @@ -17,12 +17,12 @@ buildDunePackage { pname = "letsencrypt-app"; + duneVersion = "3"; + minimalOCamlVersion = "4.08"; inherit (letsencrypt) src version - useDune2 - minimumOCamlVersion ; buildInputs = [ diff --git a/pkgs/development/ocaml-modules/letsencrypt/default.nix b/pkgs/development/ocaml-modules/letsencrypt/default.nix index a0646517b1bc..13875147a4e5 100644 --- a/pkgs/development/ocaml-modules/letsencrypt/default.nix +++ b/pkgs/development/ocaml-modules/letsencrypt/default.nix @@ -25,11 +25,11 @@ buildDunePackage rec { src = fetchurl { url = "https://github.com/mmaker/ocaml-letsencrypt/releases/download/v${version}/letsencrypt-v${version}.tbz"; - sha256 = "f90875f5c9bdcab4c8be5ec7ebe9ea763030fa708e02857300996bb16e7c2070"; + hash = "sha256-+Qh19cm9yrTIvl7H6+nqdjAw+nCOAoVzAJlrsW58IHA="; }; - minimumOCamlVersion = "4.08"; - useDune2 = true; + minimalOCamlVersion = "4.08"; + duneVersion = "3"; buildInputs = [ fmt diff --git a/pkgs/development/ocaml-modules/letsencrypt/dns.nix b/pkgs/development/ocaml-modules/letsencrypt/dns.nix index 99058f48d069..6465c8c72202 100644 --- a/pkgs/development/ocaml-modules/letsencrypt/dns.nix +++ b/pkgs/development/ocaml-modules/letsencrypt/dns.nix @@ -11,12 +11,12 @@ buildDunePackage { pname = "letsencrypt-dns"; + duneVersion = "3"; + minimalOCamlVersion = "4.08"; inherit (letsencrypt) version src - useDune2 - minimumOCamlVersion ; propagatedBuildInputs = [ From 4d86aa6b507ec80795ba9d7e8baa8f71300d0374 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 9 Jan 2023 10:34:00 +0100 Subject: [PATCH 145/163] ocamlPackages.git: use dune 3 --- pkgs/development/ocaml-modules/git/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/ocaml-modules/git/default.nix b/pkgs/development/ocaml-modules/git/default.nix index f1c4cccb51ad..1d0c10df503f 100644 --- a/pkgs/development/ocaml-modules/git/default.nix +++ b/pkgs/development/ocaml-modules/git/default.nix @@ -11,6 +11,7 @@ buildDunePackage rec { version = "3.10.1"; minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/ocaml-git/releases/download/${version}/git-${version}.tbz"; From aa339b2365f8df1858bf8c65bb11d68ea0572c36 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 9 Jan 2023 10:34:03 +0100 Subject: [PATCH 146/163] ocamlPackages.mimic: use dune 3 --- pkgs/development/ocaml-modules/mimic/default.nix | 1 + pkgs/development/ocaml-modules/mimic/happy-eyeballs.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/ocaml-modules/mimic/default.nix b/pkgs/development/ocaml-modules/mimic/default.nix index 25169c7c4913..097ecb313534 100644 --- a/pkgs/development/ocaml-modules/mimic/default.nix +++ b/pkgs/development/ocaml-modules/mimic/default.nix @@ -8,6 +8,7 @@ buildDunePackage rec { version = "0.0.6"; minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/dinosaure/mimic/releases/download/${version}/mimic-${version}.tbz"; diff --git a/pkgs/development/ocaml-modules/mimic/happy-eyeballs.nix b/pkgs/development/ocaml-modules/mimic/happy-eyeballs.nix index 72e3f99ddbe7..193509dd4903 100644 --- a/pkgs/development/ocaml-modules/mimic/happy-eyeballs.nix +++ b/pkgs/development/ocaml-modules/mimic/happy-eyeballs.nix @@ -6,6 +6,7 @@ buildDunePackage { inherit (mimic) src version; minimalOCamlVersion = "4.08"; + duneVersion = "3"; strictDeps = true; From 589e4a2bb246f08b083beecb383172f2529b7f42 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 9 Jan 2023 10:34:06 +0100 Subject: [PATCH 147/163] ocamlPackages.graphql: use dune 3 --- pkgs/development/ocaml-modules/graphql/cohttp.nix | 2 +- pkgs/development/ocaml-modules/graphql/default.nix | 2 ++ pkgs/development/ocaml-modules/graphql/lwt.nix | 2 ++ pkgs/development/ocaml-modules/graphql/parser.nix | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/graphql/cohttp.nix b/pkgs/development/ocaml-modules/graphql/cohttp.nix index 09f4757041af..c96b762189d6 100644 --- a/pkgs/development/ocaml-modules/graphql/cohttp.nix +++ b/pkgs/development/ocaml-modules/graphql/cohttp.nix @@ -8,7 +8,7 @@ buildDunePackage rec { inherit (graphql) version src; - useDune2 = true; + duneVersion = "3"; nativeBuildInputs = [ ocaml-crunch ]; propagatedBuildInputs = [ astring cohttp digestif graphql ocplib-endian ]; diff --git a/pkgs/development/ocaml-modules/graphql/default.nix b/pkgs/development/ocaml-modules/graphql/default.nix index 5bf61789e83a..679d89f44b10 100644 --- a/pkgs/development/ocaml-modules/graphql/default.nix +++ b/pkgs/development/ocaml-modules/graphql/default.nix @@ -5,6 +5,8 @@ buildDunePackage rec { inherit (graphql_parser) version src; + duneVersion = "3"; + propagatedBuildInputs = [ graphql_parser rresult yojson ]; checkInputs = [ alcotest ]; diff --git a/pkgs/development/ocaml-modules/graphql/lwt.nix b/pkgs/development/ocaml-modules/graphql/lwt.nix index 8fd6abfb8fb4..cbdcba64abb4 100644 --- a/pkgs/development/ocaml-modules/graphql/lwt.nix +++ b/pkgs/development/ocaml-modules/graphql/lwt.nix @@ -5,6 +5,8 @@ buildDunePackage rec { inherit (graphql) version src; + duneVersion = "3"; + propagatedBuildInputs = [ graphql ocaml_lwt ]; checkInputs = [ alcotest ]; diff --git a/pkgs/development/ocaml-modules/graphql/parser.nix b/pkgs/development/ocaml-modules/graphql/parser.nix index ce953a68b3c2..4042e65772bc 100644 --- a/pkgs/development/ocaml-modules/graphql/parser.nix +++ b/pkgs/development/ocaml-modules/graphql/parser.nix @@ -5,6 +5,7 @@ buildDunePackage rec { version = "0.14.0"; minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/andreas/ocaml-graphql-server/releases/download/${version}/graphql-${version}.tbz"; From 0c17d9acac514ffe647b5be40b3c9bdb43fedb93 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 9 Jan 2023 10:34:08 +0100 Subject: [PATCH 148/163] ocamlPackages.dune-release: use dune 3 --- pkgs/development/tools/ocaml/dune-release/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/ocaml/dune-release/default.nix b/pkgs/development/tools/ocaml/dune-release/default.nix index 20aec3d171ff..a2b4ddabafca 100644 --- a/pkgs/development/tools/ocaml/dune-release/default.nix +++ b/pkgs/development/tools/ocaml/dune-release/default.nix @@ -11,6 +11,7 @@ let runtimeInputs = [ opam findlib git mercurial bzip2 gnutar coreutils ]; in buildDunePackage rec { pname = "dune-release"; version = "1.6.2"; + duneVersion = "3"; minimalOCamlVersion = "4.06"; From 373aa5e812a0b1a4dc61b1207a12e8cf33b48a0c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 9 Jan 2023 10:34:11 +0100 Subject: [PATCH 149/163] ocamlPackages.curly: use dune 3 --- pkgs/development/ocaml-modules/curly/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/curly/default.nix b/pkgs/development/ocaml-modules/curly/default.nix index 20197e207af3..35e275f52f1b 100644 --- a/pkgs/development/ocaml-modules/curly/default.nix +++ b/pkgs/development/ocaml-modules/curly/default.nix @@ -6,13 +6,13 @@ buildDunePackage rec { pname = "curly"; version = "0.2.0"; - minimumOCamlVersion = "4.02"; + minimalOCamlVersion = "4.02"; - useDune2 = true; + duneVersion = "3"; src = fetchurl { url = "https://github.com/rgrinberg/curly/releases/download/${version}/curly-${version}.tbz"; - sha256 = "07vqdrklar0d5i83ip7sjw2c1v18a9m3anw07vmi5ay29pxzal6k"; + hash = "sha256-01D1+03CqxLrPoBbNWpSKOzABJf63DhQLA1kRWdueB8="; }; propagatedBuildInputs = [ result ]; From 5f73c562d0ac5092fa31e073f7dc2a26bb48587c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 9 Jan 2023 10:34:14 +0100 Subject: [PATCH 150/163] ocamlPackages.resto: use dune 3 --- pkgs/development/ocaml-modules/resto/acl.nix | 1 + pkgs/development/ocaml-modules/resto/cohttp-client.nix | 1 + .../ocaml-modules/resto/cohttp-self-serving-client.nix | 1 + pkgs/development/ocaml-modules/resto/cohttp-server.nix | 1 + pkgs/development/ocaml-modules/resto/cohttp.nix | 1 + pkgs/development/ocaml-modules/resto/default.nix | 1 + pkgs/development/ocaml-modules/resto/directory.nix | 1 + pkgs/development/ocaml-modules/resto/json.nix | 1 + 8 files changed, 8 insertions(+) diff --git a/pkgs/development/ocaml-modules/resto/acl.nix b/pkgs/development/ocaml-modules/resto/acl.nix index 0eed996289da..92a1b751ed5d 100644 --- a/pkgs/development/ocaml-modules/resto/acl.nix +++ b/pkgs/development/ocaml-modules/resto/acl.nix @@ -5,6 +5,7 @@ buildDunePackage { inherit (resto) src version meta doCheck; minimalOCamlVersion = "4.10"; + duneVersion = "3"; propagatedBuildInputs = [ resto diff --git a/pkgs/development/ocaml-modules/resto/cohttp-client.nix b/pkgs/development/ocaml-modules/resto/cohttp-client.nix index dd0db02cdd57..fe6dd6b506e1 100644 --- a/pkgs/development/ocaml-modules/resto/cohttp-client.nix +++ b/pkgs/development/ocaml-modules/resto/cohttp-client.nix @@ -9,6 +9,7 @@ buildDunePackage { pname = "resto-cohttp-client"; inherit (resto) src version meta doCheck; + duneVersion = "3"; propagatedBuildInputs = [ resto diff --git a/pkgs/development/ocaml-modules/resto/cohttp-self-serving-client.nix b/pkgs/development/ocaml-modules/resto/cohttp-self-serving-client.nix index c01fb1db9053..fac4ce7422ac 100644 --- a/pkgs/development/ocaml-modules/resto/cohttp-self-serving-client.nix +++ b/pkgs/development/ocaml-modules/resto/cohttp-self-serving-client.nix @@ -13,6 +13,7 @@ buildDunePackage { pname = "resto-cohttp-self-serving-client"; inherit (resto) src version meta doCheck; + duneVersion = "3"; propagatedBuildInputs = [ resto diff --git a/pkgs/development/ocaml-modules/resto/cohttp-server.nix b/pkgs/development/ocaml-modules/resto/cohttp-server.nix index 29e18aa88b16..6347b8628b39 100644 --- a/pkgs/development/ocaml-modules/resto/cohttp-server.nix +++ b/pkgs/development/ocaml-modules/resto/cohttp-server.nix @@ -12,6 +12,7 @@ buildDunePackage { pname = "resto-cohttp-server"; inherit (resto) src version meta doCheck; + duneVersion = "3"; propagatedBuildInputs = [ resto diff --git a/pkgs/development/ocaml-modules/resto/cohttp.nix b/pkgs/development/ocaml-modules/resto/cohttp.nix index 4de70b1dfef6..f495cadbf48f 100644 --- a/pkgs/development/ocaml-modules/resto/cohttp.nix +++ b/pkgs/development/ocaml-modules/resto/cohttp.nix @@ -3,6 +3,7 @@ buildDunePackage { pname = "resto-cohttp"; inherit (resto) src version meta doCheck; + duneVersion = "3"; propagatedBuildInputs = [ resto diff --git a/pkgs/development/ocaml-modules/resto/default.nix b/pkgs/development/ocaml-modules/resto/default.nix index 03795e5e1cf2..0d67ca947751 100644 --- a/pkgs/development/ocaml-modules/resto/default.nix +++ b/pkgs/development/ocaml-modules/resto/default.nix @@ -3,6 +3,7 @@ buildDunePackage rec { pname = "resto"; version = "1.0"; + duneVersion = "3"; src = fetchFromGitLab { owner = "nomadic-labs"; repo = "resto"; diff --git a/pkgs/development/ocaml-modules/resto/directory.nix b/pkgs/development/ocaml-modules/resto/directory.nix index 555ec590ffd7..efbb7cb608e7 100644 --- a/pkgs/development/ocaml-modules/resto/directory.nix +++ b/pkgs/development/ocaml-modules/resto/directory.nix @@ -3,6 +3,7 @@ buildDunePackage { pname = "resto-directory"; inherit (resto) src version meta doCheck; + duneVersion = "3"; propagatedBuildInputs = [ resto diff --git a/pkgs/development/ocaml-modules/resto/json.nix b/pkgs/development/ocaml-modules/resto/json.nix index dbb81fd35a62..c0f9b00d6ad7 100644 --- a/pkgs/development/ocaml-modules/resto/json.nix +++ b/pkgs/development/ocaml-modules/resto/json.nix @@ -3,6 +3,7 @@ buildDunePackage { pname = "resto-json"; inherit (resto) src version meta doCheck; + duneVersion = "3"; propagatedBuildInputs = [ resto From 389bbb0c8478a7c30713e822d468004a108cb7cd Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 9 Jan 2023 10:34:16 +0100 Subject: [PATCH 151/163] ocamlPackages.webmachine: use dune 3 --- pkgs/development/ocaml-modules/webmachine/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/webmachine/default.nix b/pkgs/development/ocaml-modules/webmachine/default.nix index c7ad92efe768..9f8749cac9fd 100644 --- a/pkgs/development/ocaml-modules/webmachine/default.nix +++ b/pkgs/development/ocaml-modules/webmachine/default.nix @@ -6,9 +6,9 @@ buildDunePackage rec { pname = "webmachine"; version = "0.7.0"; - useDune2 = true; + duneVersion = "3"; - minimumOCamlVersion = "4.04"; + minimalOCamlVersion = "4.03"; src = fetchFromGitHub { owner = "inhabitedtype"; @@ -24,7 +24,7 @@ buildDunePackage rec { doCheck = true; meta = { - inherit (src.meta) homepage; + homepage = "https://github.com/inhabitedtype/ocaml-webmachine"; license = lib.licenses.bsd3; description = "A REST toolkit for OCaml"; maintainers = [ lib.maintainers.vbgl ]; From 4ad9083feeba5d0453e859fce23756c63df7ea5a Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 9 Jan 2023 10:34:19 +0100 Subject: [PATCH 152/163] ocamlPackages.telegraml: use dune 3 --- pkgs/development/ocaml-modules/telegraml/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/ocaml-modules/telegraml/default.nix b/pkgs/development/ocaml-modules/telegraml/default.nix index 9fed705ce3ee..1aca2da2974c 100644 --- a/pkgs/development/ocaml-modules/telegraml/default.nix +++ b/pkgs/development/ocaml-modules/telegraml/default.nix @@ -10,6 +10,7 @@ buildDunePackage rec { pname = "telegraml"; version = "unstable-2021-06-17"; + duneVersion = "3"; src = fetchFromGitHub { owner = "nv-vn"; From d3491557ef2b3c06263430bb1828fb0780d5eb83 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 9 Jan 2023 10:34:22 +0100 Subject: [PATCH 153/163] ocamlPackages.cohttp: use dune 3 --- pkgs/development/ocaml-modules/cohttp/async.nix | 2 ++ pkgs/development/ocaml-modules/cohttp/default.nix | 1 + pkgs/development/ocaml-modules/cohttp/lwt-unix.nix | 2 ++ pkgs/development/ocaml-modules/cohttp/lwt.nix | 2 ++ pkgs/development/ocaml-modules/cohttp/mirage.nix | 2 ++ 5 files changed, 9 insertions(+) diff --git a/pkgs/development/ocaml-modules/cohttp/async.nix b/pkgs/development/ocaml-modules/cohttp/async.nix index dc980ce4ab2a..3e6ac4ae2d96 100644 --- a/pkgs/development/ocaml-modules/cohttp/async.nix +++ b/pkgs/development/ocaml-modules/cohttp/async.nix @@ -28,6 +28,8 @@ buildDunePackage { src ; + duneVersion = "3"; + buildInputs = [ ppx_sexp_conv ]; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/cohttp/default.nix b/pkgs/development/ocaml-modules/cohttp/default.nix index 597d4107fceb..fcbed191ad6f 100644 --- a/pkgs/development/ocaml-modules/cohttp/default.nix +++ b/pkgs/development/ocaml-modules/cohttp/default.nix @@ -9,6 +9,7 @@ buildDunePackage rec { version = "5.0.0"; minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/ocaml-cohttp/releases/download/v${version}/cohttp-${version}.tbz"; diff --git a/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix b/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix index 2886cac1c7b1..3a5d5ff529d0 100644 --- a/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix +++ b/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix @@ -9,6 +9,8 @@ buildDunePackage { pname = "cohttp-lwt-unix"; inherit (cohttp-lwt) version src; + duneVersion = "3"; + buildInputs = [ cmdliner ppx_sexp_conv ]; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/cohttp/lwt.nix b/pkgs/development/ocaml-modules/cohttp/lwt.nix index 74fcfcbd4988..42e1d3808639 100644 --- a/pkgs/development/ocaml-modules/cohttp/lwt.nix +++ b/pkgs/development/ocaml-modules/cohttp/lwt.nix @@ -7,6 +7,8 @@ buildDunePackage { src ; + duneVersion = "3"; + buildInputs = [ ppx_sexp_conv ]; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/cohttp/mirage.nix b/pkgs/development/ocaml-modules/cohttp/mirage.nix index 048202ccdbce..3b1c82194973 100644 --- a/pkgs/development/ocaml-modules/cohttp/mirage.nix +++ b/pkgs/development/ocaml-modules/cohttp/mirage.nix @@ -10,6 +10,8 @@ buildDunePackage { inherit (cohttp) version src; + duneVersion = "3"; + nativeBuildInputs = [ ppx_sexp_conv ]; propagatedBuildInputs = [ From ebe4402d0a42452da47486254463995c0ed232a9 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 9 Jan 2023 10:34:27 +0100 Subject: [PATCH 154/163] ocamlPackages.conduit: use dune 3 --- pkgs/development/ocaml-modules/conduit/async.nix | 2 ++ pkgs/development/ocaml-modules/conduit/default.nix | 3 ++- pkgs/development/ocaml-modules/conduit/lwt-unix.nix | 1 + pkgs/development/ocaml-modules/conduit/lwt.nix | 1 + pkgs/development/ocaml-modules/conduit/mirage.nix | 1 + 5 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/conduit/async.nix b/pkgs/development/ocaml-modules/conduit/async.nix index fb5a96932164..a110e6dc1677 100644 --- a/pkgs/development/ocaml-modules/conduit/async.nix +++ b/pkgs/development/ocaml-modules/conduit/async.nix @@ -9,6 +9,8 @@ buildDunePackage { src ; + duneVersion = "3"; + buildInputs = [ ppx_sexp_conv ppx_here ]; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/conduit/default.nix b/pkgs/development/ocaml-modules/conduit/default.nix index d097ec66ac47..99f3df493396 100644 --- a/pkgs/development/ocaml-modules/conduit/default.nix +++ b/pkgs/development/ocaml-modules/conduit/default.nix @@ -7,7 +7,8 @@ buildDunePackage rec { pname = "conduit"; version = "6.1.0"; - minimalOCamlVersion = "4.03"; + minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/ocaml-conduit/releases/download/v${version}/conduit-${version}.tbz"; diff --git a/pkgs/development/ocaml-modules/conduit/lwt-unix.nix b/pkgs/development/ocaml-modules/conduit/lwt-unix.nix index 81a77f356aff..cb86ea5f4f06 100644 --- a/pkgs/development/ocaml-modules/conduit/lwt-unix.nix +++ b/pkgs/development/ocaml-modules/conduit/lwt-unix.nix @@ -6,6 +6,7 @@ buildDunePackage { pname = "conduit-lwt-unix"; inherit (conduit-lwt) version src; + duneVersion = "3"; buildInputs = [ ppx_sexp_conv ]; diff --git a/pkgs/development/ocaml-modules/conduit/lwt.nix b/pkgs/development/ocaml-modules/conduit/lwt.nix index 641d57db10e3..2ec6f556916d 100644 --- a/pkgs/development/ocaml-modules/conduit/lwt.nix +++ b/pkgs/development/ocaml-modules/conduit/lwt.nix @@ -3,6 +3,7 @@ buildDunePackage { pname = "conduit-lwt"; inherit (conduit) version src; + duneVersion = "3"; buildInputs = [ ppx_sexp_conv ]; diff --git a/pkgs/development/ocaml-modules/conduit/mirage.nix b/pkgs/development/ocaml-modules/conduit/mirage.nix index 61fb9b569b7b..09c7df5edab6 100644 --- a/pkgs/development/ocaml-modules/conduit/mirage.nix +++ b/pkgs/development/ocaml-modules/conduit/mirage.nix @@ -9,6 +9,7 @@ buildDunePackage { pname = "conduit-mirage"; inherit (conduit-lwt) version src; + duneVersion = "3"; nativeBuildInputs = [ ppx_sexp_conv ]; From e2f0148a2052cb6d948d7f5326cde18391f48f5f Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 9 Jan 2023 10:34:41 +0100 Subject: [PATCH 155/163] =?UTF-8?q?ocamlPackages.dns:=206.3.0=20=E2=86=92?= =?UTF-8?q?=206.4.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ocamlPackages.happy-eyeballs: 0.3.0 → 0.4.0 --- pkgs/development/ocaml-modules/dns/certify.nix | 1 + pkgs/development/ocaml-modules/dns/cli.nix | 1 + pkgs/development/ocaml-modules/dns/client.nix | 1 + pkgs/development/ocaml-modules/dns/default.nix | 5 +++-- pkgs/development/ocaml-modules/dns/dnssec.nix | 1 + pkgs/development/ocaml-modules/dns/mirage.nix | 1 + pkgs/development/ocaml-modules/dns/resolver.nix | 1 + pkgs/development/ocaml-modules/dns/server.nix | 1 + pkgs/development/ocaml-modules/dns/stub.nix | 1 + pkgs/development/ocaml-modules/dns/tsig.nix | 1 + pkgs/development/ocaml-modules/happy-eyeballs/default.nix | 4 ++-- pkgs/development/ocaml-modules/happy-eyeballs/lwt.nix | 1 + pkgs/development/ocaml-modules/happy-eyeballs/mirage.nix | 1 + 13 files changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/dns/certify.nix b/pkgs/development/ocaml-modules/dns/certify.nix index ff98b5508617..3260e139fbbb 100644 --- a/pkgs/development/ocaml-modules/dns/certify.nix +++ b/pkgs/development/ocaml-modules/dns/certify.nix @@ -8,6 +8,7 @@ buildDunePackage { pname = "dns-certify"; inherit (dns) version src; + duneVersion = "3"; propagatedBuildInputs = [ dns diff --git a/pkgs/development/ocaml-modules/dns/cli.nix b/pkgs/development/ocaml-modules/dns/cli.nix index fd54d9c8c86f..6e23eeecba97 100644 --- a/pkgs/development/ocaml-modules/dns/cli.nix +++ b/pkgs/development/ocaml-modules/dns/cli.nix @@ -10,6 +10,7 @@ buildDunePackage { minimalOCamlVersion = "4.08"; inherit (dns) version src; + duneVersion = "3"; # no need to propagate as this is primarily # an executable package diff --git a/pkgs/development/ocaml-modules/dns/client.nix b/pkgs/development/ocaml-modules/dns/client.nix index 6ef93dc4ad1d..bfcde93bbf83 100644 --- a/pkgs/development/ocaml-modules/dns/client.nix +++ b/pkgs/development/ocaml-modules/dns/client.nix @@ -10,6 +10,7 @@ buildDunePackage { pname = "dns-client"; inherit (dns) src version; + duneVersion = "3"; propagatedBuildInputs = [ cstruct fmt logs dns randomconv domain-name ipaddr lwt mirage-random mirage-time mirage-clock diff --git a/pkgs/development/ocaml-modules/dns/default.nix b/pkgs/development/ocaml-modules/dns/default.nix index 174adce4320f..70e3b4435370 100644 --- a/pkgs/development/ocaml-modules/dns/default.nix +++ b/pkgs/development/ocaml-modules/dns/default.nix @@ -5,13 +5,14 @@ buildDunePackage rec { pname = "dns"; - version = "6.3.0"; + version = "6.4.1"; minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/ocaml-dns/releases/download/v${version}/dns-${version}.tbz"; - sha256 = "sha256-3EAjenN9EIi4PsXCZDevmEPDaS4xbESbcbB7pFgwc1E="; + hash = "sha256-omG0fKZAHGc+4ERC8cyK47jeEkiBZkB+1fz46j6SDno="; }; propagatedBuildInputs = [ fmt logs ptime domain-name gmap cstruct ipaddr lru duration metrics base64 ]; diff --git a/pkgs/development/ocaml-modules/dns/dnssec.nix b/pkgs/development/ocaml-modules/dns/dnssec.nix index 06fe3f057eb5..3e6acc474b3e 100644 --- a/pkgs/development/ocaml-modules/dns/dnssec.nix +++ b/pkgs/development/ocaml-modules/dns/dnssec.nix @@ -7,6 +7,7 @@ buildDunePackage { pname = "dnssec"; inherit (dns) version src; + duneVersion = "3"; propagatedBuildInputs = [ cstruct diff --git a/pkgs/development/ocaml-modules/dns/mirage.nix b/pkgs/development/ocaml-modules/dns/mirage.nix index 3c69788e634d..640578831b22 100644 --- a/pkgs/development/ocaml-modules/dns/mirage.nix +++ b/pkgs/development/ocaml-modules/dns/mirage.nix @@ -4,6 +4,7 @@ buildDunePackage { pname = "dns-mirage"; inherit (dns) version src; + duneVersion = "3"; propagatedBuildInputs = [ dns diff --git a/pkgs/development/ocaml-modules/dns/resolver.nix b/pkgs/development/ocaml-modules/dns/resolver.nix index a262280a460a..0ee30835588d 100644 --- a/pkgs/development/ocaml-modules/dns/resolver.nix +++ b/pkgs/development/ocaml-modules/dns/resolver.nix @@ -8,6 +8,7 @@ buildDunePackage { pname = "dns-resolver"; inherit (dns) version src; + duneVersion = "3"; propagatedBuildInputs = [ dns diff --git a/pkgs/development/ocaml-modules/dns/server.nix b/pkgs/development/ocaml-modules/dns/server.nix index 8570bb2491ef..794aea363bb9 100644 --- a/pkgs/development/ocaml-modules/dns/server.nix +++ b/pkgs/development/ocaml-modules/dns/server.nix @@ -7,6 +7,7 @@ buildDunePackage { pname = "dns-server"; inherit (dns) version src; + duneVersion = "3"; propagatedBuildInputs = [ dns diff --git a/pkgs/development/ocaml-modules/dns/stub.nix b/pkgs/development/ocaml-modules/dns/stub.nix index 17d5c0029b1d..943d28a57c5b 100644 --- a/pkgs/development/ocaml-modules/dns/stub.nix +++ b/pkgs/development/ocaml-modules/dns/stub.nix @@ -7,6 +7,7 @@ buildDunePackage { pname = "dns-stub"; inherit (dns) version src; + duneVersion = "3"; propagatedBuildInputs = [ dns diff --git a/pkgs/development/ocaml-modules/dns/tsig.nix b/pkgs/development/ocaml-modules/dns/tsig.nix index 9ca078674a96..3ecc90d39853 100644 --- a/pkgs/development/ocaml-modules/dns/tsig.nix +++ b/pkgs/development/ocaml-modules/dns/tsig.nix @@ -4,6 +4,7 @@ buildDunePackage { pname = "dns-tsig"; inherit (dns) version src; + duneVersion = "3"; propagatedBuildInputs = [ mirage-crypto diff --git a/pkgs/development/ocaml-modules/happy-eyeballs/default.nix b/pkgs/development/ocaml-modules/happy-eyeballs/default.nix index 0c3109106c3d..d5b0691fdffa 100644 --- a/pkgs/development/ocaml-modules/happy-eyeballs/default.nix +++ b/pkgs/development/ocaml-modules/happy-eyeballs/default.nix @@ -4,13 +4,13 @@ buildDunePackage rec { pname = "happy-eyeballs"; - version = "0.3.0"; + version = "0.4.0"; minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/roburio/happy-eyeballs/releases/download/v${version}/happy-eyeballs-${version}.tbz"; - sha256 = "17mnid1gvq1ml1zmqzn0m6jmrqw4kqdrjqrdsrphl5kxxyhs03m6"; + hash = "sha256-gR9q4J/DnYJz8oYmk/wy17h4F6wxbllba/gkor5i1nQ="; }; strictDeps = true; diff --git a/pkgs/development/ocaml-modules/happy-eyeballs/lwt.nix b/pkgs/development/ocaml-modules/happy-eyeballs/lwt.nix index e9b260b2c144..9160b9233fa5 100644 --- a/pkgs/development/ocaml-modules/happy-eyeballs/lwt.nix +++ b/pkgs/development/ocaml-modules/happy-eyeballs/lwt.nix @@ -17,6 +17,7 @@ buildDunePackage { inherit (happy-eyeballs) src version; minimalOCamlVersion = "4.08"; + duneVersion = "3"; strictDeps = true; diff --git a/pkgs/development/ocaml-modules/happy-eyeballs/mirage.nix b/pkgs/development/ocaml-modules/happy-eyeballs/mirage.nix index c30348777634..22f17111e44b 100644 --- a/pkgs/development/ocaml-modules/happy-eyeballs/mirage.nix +++ b/pkgs/development/ocaml-modules/happy-eyeballs/mirage.nix @@ -19,6 +19,7 @@ buildDunePackage { inherit (happy-eyeballs) src version; minimalOCamlVersion = "4.08"; + duneVersion = "3"; strictDeps = true; From e2ba4093d19a8e068c8a05257be0d4664df1c68b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 12 Jan 2023 17:24:14 +0000 Subject: [PATCH 156/163] git-machete: 3.13.2 -> 3.14.0 --- pkgs/applications/version-management/git-machete/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-machete/default.nix b/pkgs/applications/version-management/git-machete/default.nix index 0212ea9b89d1..951d241ec65c 100644 --- a/pkgs/applications/version-management/git-machete/default.nix +++ b/pkgs/applications/version-management/git-machete/default.nix @@ -12,13 +12,13 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.13.2"; + version = "3.14.0"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - hash = "sha256-K9oJvvESHWCJFSgqycA7N4cG7WbTDwXZExnXUs4Qlp8="; + hash = "sha256-UgWPm4IxzydO1qqhjbodUIAmqIhTIITYARMvw+F9T7E="; }; nativeBuildInputs = [ installShellFiles ]; From df4b8ca2ef45f9f690779d935ff4b95d5350b59e Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Thu, 12 Jan 2023 19:09:54 +0100 Subject: [PATCH 157/163] libreddit: 0.27.0 -> 0.27.1 --- pkgs/servers/libreddit/default.nix | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/pkgs/servers/libreddit/default.nix b/pkgs/servers/libreddit/default.nix index 4dbc9f6a5050..60c073e3a828 100644 --- a/pkgs/servers/libreddit/default.nix +++ b/pkgs/servers/libreddit/default.nix @@ -3,31 +3,21 @@ , nixosTests , rustPlatform , fetchFromGitHub -, fetchpatch , Security }: rustPlatform.buildRustPackage rec { pname = "libreddit"; - version = "0.27.0"; + version = "0.27.1"; src = fetchFromGitHub { owner = "libreddit"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-+sSzYewqN3VjTl+wjgan3yxlFiuCg2rprJDpDktuQHo="; + hash = "sha256-3Q/Vl126EMRSNdStpZqFEkA0Kjzu6BeyBhokTQrrQXE="; }; - cargoSha256 = "sha256-HhtslN6JV9DUBhuyesciZGGYVz7mvpdyxVps9xAc+Rs="; - - patches = [ - # https://github.com/libreddit/libreddit/pull/687 - (fetchpatch { - name = "fix-cfg-test.patch"; - url = "https://github.com/libreddit/libreddit/commit/dff91da8777dc42d38abf8b5d63addbd71fdabff.patch"; - sha256 = "sha256-6np5gf8cyKotF7KJ19mCtRAF7SxDpNFpQCgdy/XDsng="; - }) - ]; + cargoSha256 = "sha256-TA0Rsya3vx6N/iAWpRmB7Byz7AIR0sdfk3kJ8wgvWHY="; buildInputs = lib.optionals stdenv.isDarwin [ Security From 2963534f975d3b12e12f1451df3f2df81b2a06ab Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 12 Jan 2023 21:10:18 +0100 Subject: [PATCH 158/163] python3Packages.aiowebostv: 0.2.1 -> 0.3.0 Diff: https://github.com/home-assistant-libs/aiowebostv/compare/refs/tags/v0.2.1...v0.3.0 --- pkgs/development/python-modules/aiowebostv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiowebostv/default.nix b/pkgs/development/python-modules/aiowebostv/default.nix index 436014106066..a5d7d153cf03 100644 --- a/pkgs/development/python-modules/aiowebostv/default.nix +++ b/pkgs/development/python-modules/aiowebostv/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "aiowebostv"; - version = "0.2.1"; + version = "0.3.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-r/XdxF7/g6uDQIATi/OC6lNTUtBZg1jdgZHZilPPFNc="; + hash = "sha256-W9RexBXo0yZStyFEAf7z5ki8tTHkc2RLD3wkX6nQsCE="; }; propagatedBuildInputs = [ From d64d4a57880fa502fc89511c509ca498dbdf11b1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 12 Jan 2023 21:11:03 +0100 Subject: [PATCH 159/163] python3Packages.pylitterbot: 2023.1.0 -> 2023.1.1 Diff: https://github.com/natekspencer/pylitterbot/compare/refs/tags/2023.1.0...2023.1.1 Changelog: https://github.com/natekspencer/pylitterbot/releases/tag/2023.1.1 --- pkgs/development/python-modules/pylitterbot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylitterbot/default.nix b/pkgs/development/python-modules/pylitterbot/default.nix index 91f09cc531ff..fea8da2148ef 100644 --- a/pkgs/development/python-modules/pylitterbot/default.nix +++ b/pkgs/development/python-modules/pylitterbot/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pylitterbot"; - version = "2023.1.0"; + version = "2023.1.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "natekspencer"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-XUiDZW3r8I8Vyx30UhopQ6S0HpSi0VNgvyu2RMNt2Eg="; + hash = "sha256-nWKBbb2S8V81KQihGQYg9GBK97xv5FXuem5pUPB+cew="; }; nativeBuildInputs = [ From 90770d9744f8c5faeb9a166256efe17aea9ba411 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 12 Jan 2023 06:30:00 -0800 Subject: [PATCH 160/163] python310Packages.pytibber: 0.26.7 -> 0.26.8 https://github.com/Danielhiversen/pyTibber/releases/tag/0.26.8 --- pkgs/development/python-modules/pytibber/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytibber/default.nix b/pkgs/development/python-modules/pytibber/default.nix index 4f0b96fed32c..ffcdbf5675be 100644 --- a/pkgs/development/python-modules/pytibber/default.nix +++ b/pkgs/development/python-modules/pytibber/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pytibber"; - version = "0.26.7"; + version = "0.26.8"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pyTibber"; rev = "refs/tags/${version}"; - hash = "sha256-T2J31+H/cO000qi2AlEGaFtAu0fl7u1LAA/QUxRAiK8="; + hash = "sha256-q3mlAlcetg01vHxxSIZjyDPxAqUWcdyzK4qsVmQAreA="; }; propagatedBuildInputs = [ From 154c27342e7624169f5989d269c31e3b78afb8d7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 12 Jan 2023 21:20:30 +0100 Subject: [PATCH 161/163] home-assistant: 2023.1.3 -> 2023.1.4 https://github.com/home-assistant/core/releases/tag/2023.1.4 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 906585f10b26..46d10548161b 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2023.1.3"; + version = "2023.1.4"; components = { "3_day_blinds" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 420bc78690ba..d0fdfa16be00 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -195,7 +195,7 @@ let extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs); # Don't forget to run parse-requirements.py after updating - hassVersion = "2023.1.3"; + hassVersion = "2023.1.4"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -213,7 +213,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-BYUh6rOW6GgOSaN9zDtwn+aiHcNI5BBns9jPc3A3DdI="; + hash = "sha256-up6AKdrbiLuVf58yDUGlNME7qVFbegnnb3zoTF4Gj3s="; }; # leave this in, so users don't have to constantly update their downstream patch handling From 100ee47ee8488b0fd5dab22a5a2f96a976e952e6 Mon Sep 17 00:00:00 2001 From: "\"Matthieu Coudron\"" <"mcoudron@hotmail.com"> Date: Thu, 12 Jan 2023 14:55:46 +0100 Subject: [PATCH 162/163] vimPlugins.b64-nvim: init at 2022-08-22 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 6481c992e229..68afc4812068 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -821,6 +821,18 @@ final: prev: meta.homepage = "https://github.com/ayu-theme/ayu-vim/"; }; + b64-nvim = buildVimPluginFrom2Nix { + pname = "b64.nvim"; + version = "2022-08-22"; + src = fetchFromGitHub { + owner = "taybart"; + repo = "b64.nvim"; + rev = "12dde6ebc3035f010833f513cfbd9abad92b28b3"; + sha256 = "0h3ghaddqf00q7gih53ni7mx0iw5k9m616j34yg6hdf6s12zp5qw"; + }; + meta.homepage = "https://github.com/taybart/b64.nvim/"; + }; + barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar.nvim"; version = "2023-01-03"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 36ef070fb765..30a191de7b1a 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -67,6 +67,7 @@ https://github.com/rmagatti/auto-session/,, https://github.com/vim-scripts/autoload_cscope.vim/,, https://github.com/rafi/awesome-vim-colorschemes/,, https://github.com/ayu-theme/ayu-vim/,, +https://github.com/taybart/b64.nvim/,HEAD, https://github.com/romgrk/barbar.nvim/,, https://github.com/utilyre/barbecue.nvim/,, https://github.com/chriskempson/base16-vim/,, From bbb6af88eb51061ff6256f4ad7c96df5517e3fec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Thu, 12 Jan 2023 20:49:20 +0100 Subject: [PATCH 163/163] agda: pass through meta --- pkgs/build-support/agda/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix index 9fe9aa457987..fed0f6cb3441 100644 --- a/pkgs/build-support/agda/default.nix +++ b/pkgs/build-support/agda/default.nix @@ -22,13 +22,14 @@ let unwrapped = Agda; tests = { inherit (nixosTests) agda; }; }; + inherit (Agda) meta; } '' mkdir -p $out/bin makeWrapper ${Agda}/bin/agda $out/bin/agda \ --add-flags "--with-compiler=${ghc}/bin/ghc" \ --add-flags "--library-file=${library-file}" \ --add-flags "--local-interfaces" - makeWrapper ${Agda}/bin/agda-mode $out/bin/agda-mode + ln -s ${Agda}/bin/agda-mode $out/bin/agda-mode ''; # Local interfaces has been added for now: See https://github.com/agda/agda/issues/4526 withPackages = arg: if builtins.isAttrs arg then withPackages' arg else withPackages' { pkgs = arg; };