From 6dd516414ad3dd0317b05c3f4129291a307f3659 Mon Sep 17 00:00:00 2001 From: Isabel Kaspriskie Date: Thu, 20 Oct 2022 10:12:46 -0400 Subject: [PATCH 01/33] conan: 1.49.0 -> 1.53.0 --- pkgs/development/tools/build-managers/conan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index a72106ace3c4..3a2a4b434eb0 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -32,14 +32,14 @@ let newPython = python3.override { }; in newPython.pkgs.buildPythonApplication rec { - version = "1.49.0"; + version = "1.53.0"; pname = "conan"; src = fetchFromGitHub { owner = "conan-io"; repo = "conan"; rev = version; - hash = "sha256-BJGstNAnAZtpwagsCY+4quTd0/79zL+v4ifKikS3vaw="; + hash = "sha256-2DNDNdZO1D30egOiYa3qw8F2xsUTBOm/CHv07v5OrC8="; }; propagatedBuildInputs = with newPython.pkgs; [ From 285d1398d1af8cf69527bd9ece47388534305539 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20S=C3=A1nchez?= Date: Sat, 12 Nov 2022 00:25:45 +0000 Subject: [PATCH 02/33] maintainers: add davsanchez --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 86cec69705fb..4818133df6f6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3218,6 +3218,12 @@ githubId = 798427; name = "Davor Babic"; }; + davsanchez = { + email = "davidslt+nixpkgs@pm.me"; + github = "davsanchez"; + githubId = 11422515; + name = "David Sánchez"; + }; dawidsowa = { email = "dawid_sowa@posteo.net"; github = "dawidsowa"; From 54c8b865d7d9abd738b86bafc7a1cdc61f66c815 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20S=C3=A1nchez?= Date: Sat, 12 Nov 2022 00:26:40 +0000 Subject: [PATCH 03/33] cotp: init at 1.1.0 --- pkgs/applications/misc/cotp/default.nix | 31 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/applications/misc/cotp/default.nix diff --git a/pkgs/applications/misc/cotp/default.nix b/pkgs/applications/misc/cotp/default.nix new file mode 100644 index 000000000000..408838a0a284 --- /dev/null +++ b/pkgs/applications/misc/cotp/default.nix @@ -0,0 +1,31 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, AppKit +, libxcb +}: + +rustPlatform.buildRustPackage rec { + name = "cotp"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "replydev"; + repo = "cotp"; + rev = "v${version}"; + hash = "sha256-SbS+ch7/45kZb49jW2mnRWQruLrfrNfeZFqEPHQKGUg="; + }; + + cargoHash = "sha256-2lIR3K4/hr4XSmNGFd/dhwoFOtEB9KSnUrZkcaCyc9k="; + + buildInputs = lib.optionals stdenv.isLinux [ libxcb ] + ++ lib.optionals stdenv.isDarwin [ AppKit ]; + + meta = with lib; { + homepage = "https://github.com/replydev/cotp"; + description = "Trustworthy, encrypted, command-line TOTP/HOTP authenticator app with import functionality"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ davsanchez ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c90cc0cd039f..2ca8051e9377 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -388,6 +388,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + cotp = callPackage ../applications/misc/cotp { + inherit (darwin.apple_sdk.frameworks) AppKit; + }; + cmark = callPackage ../development/libraries/cmark { }; cmark-gfm = callPackage ../development/libraries/cmark-gfm { }; From ed060ff92b34bba159fe52a5697030be6e3a4805 Mon Sep 17 00:00:00 2001 From: Enno Richter Date: Mon, 2 Jan 2023 06:36:22 +0100 Subject: [PATCH 04/33] prometheus-exporters: update rspamd exporter for prometheus-json-exporter >=0.5.0 --- .../modules/services/monitoring/prometheus/exporters/rspamd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/prometheus/exporters/rspamd.nix b/nixos/modules/services/monitoring/prometheus/exporters/rspamd.nix index 0b48827f43f7..f9dcfad07d30 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/rspamd.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/rspamd.nix @@ -9,7 +9,7 @@ let pkgs.writeText "rspamd-exporter-config.yml" (builtins.toJSON conf); generateConfig = extraLabels: { - metrics = (map (path: { + modules.default.metrics = (map (path: { name = "rspamd_${replaceStrings [ "[" "." " " "]" "\\" "'" ] [ "_" "_" "_" "" "" "" ] path}"; path = "{ .${path} }"; labels = extraLabels; From b2bdec584c7249430aa033cb19fa6d149bfdfe12 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 8 Jan 2023 14:25:05 +0100 Subject: [PATCH 05/33] SkypeExport: add darwin support --- .../instant-messengers/SkypeExport/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix b/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix index a150014daa7c..f402faf965be 100644 --- a/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix +++ b/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, boost166 }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, boost }: stdenv.mkDerivation rec { pname = "SkypeExport"; @@ -11,8 +11,16 @@ stdenv.mkDerivation rec { sha256 = "1ilkh0s3dz5cp83wwgmscnfmnyck5qcwqg1yxp9zv6s356dxnbak"; }; + patches = [ + (fetchpatch { + name = "boost167.patch"; + url = "https://github.com/Temptin/SkypeExport/commit/ef60f2e4fc9e4a5764c8d083a73b585457bc10b1.patch"; + sha256 = "sha256-t+/v7c66OULmQCD/sNt+iDJeQ/6UG0CJ8uQY2PVSFQo="; + }) + ]; + nativeBuildInputs = [ cmake ]; - buildInputs = [ boost166 ]; + buildInputs = [ boost ]; preConfigure = "cd src/SkypeExport/_gccbuild/linux"; installPhase = "install -Dt $out/bin SkypeExport"; @@ -21,7 +29,7 @@ stdenv.mkDerivation rec { description = "Export Skype history to HTML"; homepage = "https://github.com/Temptin/SkypeExport"; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ yana ]; }; } From ca1bcab936e93a7c43eef4ba73d8d9e12913623b Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 11 Jan 2023 03:54:02 +0100 Subject: [PATCH 06/33] opa: migrate to OCaml 4.05 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f33f49a051fc..14625f422cbb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15181,7 +15181,7 @@ with pkgs; ocsigen-i18n = callPackage ../development/tools/ocaml/ocsigen-i18n { }; opa = callPackage ../development/compilers/opa { - ocamlPackages = ocaml-ng.ocamlPackages_4_04; + ocamlPackages = ocaml-ng.ocamlPackages_4_05; }; opaline = callPackage ../development/tools/ocaml/opaline { }; From 0127d48a3e4f8a990be8541ee70bc683897ef7fd Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 11 Jan 2023 03:54:18 +0100 Subject: [PATCH 07/33] monotoneViz: migrate to OCaml 4.05 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 14625f422cbb..3d3a5be9def0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30827,7 +30827,7 @@ with pkgs; }; monotoneViz = callPackage ../applications/version-management/monotone-viz { - ocamlPackages = ocaml-ng.ocamlPackages_4_01_0; + ocamlPackages = ocaml-ng.ocamlPackages_4_05; }; monitor = callPackage ../applications/system/monitor { From 6f8fdadc739ae6b1c2a111d11a6dbe4de9ef2a5a Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 12 Jan 2023 12:16:27 +0000 Subject: [PATCH 08/33] =?UTF-8?q?gnome.gnome-boxes:=2043.1=20=E2=86=92=204?= =?UTF-8?q?3.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-boxes/-/compare/43.1...43.2 --- pkgs/desktops/gnome/apps/gnome-boxes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix index dfc7cb3a1cab..78f5f059d156 100644 --- a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix @@ -51,11 +51,11 @@ stdenv.mkDerivation rec { pname = "gnome-boxes"; - version = "43.1"; + version = "43.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "NB5qXO1RrVAPwd00ZZ1YhsP3YEViS1POZBv/Y8WwimE="; + sha256 = "nD4OlDPBhTqZ7VLt7BMmP0Q/hW28o7IWXC46cLhjKzA="; }; patches = [ From 3300156bf146a32872ff856f6494d75fa7674b98 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 12 Jan 2023 12:20:15 +0000 Subject: [PATCH 09/33] =?UTF-8?q?gnome.gnome-chess:=2043.0=20=E2=86=92=204?= =?UTF-8?q?3.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-chess/-/compare/43.0...43.1 --- pkgs/desktops/gnome/games/gnome-chess/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/games/gnome-chess/default.nix b/pkgs/desktops/gnome/games/gnome-chess/default.nix index a4f01aadc206..e431d2de012f 100644 --- a/pkgs/desktops/gnome/games/gnome-chess/default.nix +++ b/pkgs/desktops/gnome/games/gnome-chess/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "gnome-chess"; - version = "43.0"; + version = "43.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-chess/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "ZDP+3y9C+yK/IC2fE47C7gcjetXXQ4CQULXICbVs28s="; + sha256 = "c08JLZX8YECe6so0J7WkjLm1mdoRmVEZ2FuqmWU+ApI="; }; nativeBuildInputs = [ From a8fb2db2fe186340799e321ee8d1918d60ff18fd Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 12 Jan 2023 12:22:27 +0000 Subject: [PATCH 10/33] =?UTF-8?q?gnome.gnome-remote-desktop:=2043.2=20?= =?UTF-8?q?=E2=86=92=2043.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-remote-desktop/-/compare/43.2...43.3 --- pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix index 251d0af37f83..1a79cce0848f 100644 --- a/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix +++ b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { pname = "gnome-remote-desktop"; - version = "43.2"; + version = "43.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-hKn9Zam62M73NIL9otIKzRIvC4Uhsd6GyUE4ibn6l3E="; + hash = "sha256-EdRR0f3kTxgJ6/Ya/0vqX570/cAjWaiWR/bp59RUKaw="; }; nativeBuildInputs = [ From 0717296559b7219bad4475fe0c842309ead4730b Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 12 Jan 2023 12:23:37 +0000 Subject: [PATCH 11/33] =?UTF-8?q?gnome.gnome-software:=2043.2=20=E2=86=92?= =?UTF-8?q?=2043.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-software/-/compare/43.2...43.3 --- pkgs/desktops/gnome/core/gnome-software/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-software/default.nix b/pkgs/desktops/gnome/core/gnome-software/default.nix index ee15653d1254..450da49cf980 100644 --- a/pkgs/desktops/gnome/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome/core/gnome-software/default.nix @@ -45,11 +45,11 @@ in stdenv.mkDerivation rec { pname = "gnome-software"; - version = "43.2"; + version = "43.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "Iqp/CjF8dw9ouJfp5RKyy+2xgbaV/9sLZY2Zu9ZPNo0="; + sha256 = "k+6AdHl4rSzALlrnPQo9Psgu6hNPx3niqpFpAbu1gJA="; }; patches = [ From c492cff0a7bd5f1b37f3a1b93a42a73983107a0c Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 12 Jan 2023 12:25:58 +0000 Subject: [PATCH 12/33] =?UTF-8?q?gnome.eog:=2043.1=20=E2=86=92=2043.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/eog/-/compare/43.1...43.2 --- pkgs/desktops/gnome/core/eog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/eog/default.nix b/pkgs/desktops/gnome/core/eog/default.nix index 9ec95d1e4f16..67ac1cfa9708 100644 --- a/pkgs/desktops/gnome/core/eog/default.nix +++ b/pkgs/desktops/gnome/core/eog/default.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "eog"; - version = "43.1"; + version = "43.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-/tef88oZusYvJxVcm91p7vh1hwuXHm3LCqOMCT0TGXE="; + sha256 = "sha256-nc/c5VhakOK7HPV+N3yx6xLUG9m8ubus31BrwbE1Tvk="; }; patches = [ From 55ec3d47b9a3a7b139f4596250a1f125bbedbd8a Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 12 Jan 2023 12:32:15 +0000 Subject: [PATCH 13/33] =?UTF-8?q?gnome.gnome-maps:=2043.2=20=E2=86=92=2043?= =?UTF-8?q?.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-maps/-/compare/v43.2...v43.3 --- pkgs/desktops/gnome/apps/gnome-maps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-maps/default.nix b/pkgs/desktops/gnome/apps/gnome-maps/default.nix index dea63dd14d0b..0cb6f374f29b 100644 --- a/pkgs/desktops/gnome/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-maps/default.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { pname = "gnome-maps"; - version = "43.2"; + version = "43.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-wCIdJQvkXqNulxrmO/3pcaRhRclnscZZ6WxbBypxVR0="; + sha256 = "sha256-iVUelLEnEwXP/yBLRMGDZyZ3gaV9LMt7b3u6Yo4JxRE="; }; doCheck = true; From e72df3095ff26bef15dcd7b27b0aa3710cc61f15 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 12 Jan 2023 12:33:29 +0000 Subject: [PATCH 14/33] =?UTF-8?q?gnome.tali:=2040.8=20=E2=86=92=2040.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/tali/-/compare/40.8...40.9 --- pkgs/desktops/gnome/games/tali/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/games/tali/default.nix b/pkgs/desktops/gnome/games/tali/default.nix index 99a6cce66431..f5c1e83ee4d0 100644 --- a/pkgs/desktops/gnome/games/tali/default.nix +++ b/pkgs/desktops/gnome/games/tali/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "tali"; - version = "40.8"; + version = "40.9"; src = fetchurl { url = "mirror://gnome/sources/tali/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "bBeMFg/LtNEb49FWnVOODngUDVC721KnWDGI95XAF+4="; + sha256 = "+p7eNm8KcuTKpSGJw6sLEMG1aoDHiFsBZgJVjETc59M="; }; nativeBuildInputs = [ From 0fdc2b7ba0fbfaf0de06dc0b7f90e6d70b5d5675 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 12 Jan 2023 12:35:31 +0000 Subject: [PATCH 15/33] =?UTF-8?q?gnome-text-editor:=2043.1=20=E2=86=92=204?= =?UTF-8?q?3.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-text-editor/-/compare/43.1...43.2 --- pkgs/desktops/gnome/apps/gnome-text-editor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix b/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix index 2e813fc10de7..ff2141030faa 100644 --- a/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "gnome-text-editor"; - version = "43.1"; + version = "43.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-text-editor/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-lzpLDeto+fkaVKTdQVtq/em1rj7mhLx2FHH5QpD59ss="; + sha256 = "sha256-MwRcehI/qife5+ubqabybxsXGMWg52M30Hmg1MkA4UY="; }; nativeBuildInputs = [ From 687b02945de06249cadf563bc0cc88a00a277ac7 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 12 Jan 2023 21:54:05 +0100 Subject: [PATCH 16/33] sile: postpone checks to passthru.tests --- pkgs/tools/typesetting/sile/default.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix index e1a75976cfb1..a20aa5dc09e0 100644 --- a/pkgs/tools/typesetting/sile/default.nix +++ b/pkgs/tools/typesetting/sile/default.nix @@ -12,6 +12,8 @@ , libiconv , makeFontsConf , gentium +, runCommand +, sile }: let @@ -69,12 +71,20 @@ stdenv.mkDerivation rec { ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.AppKit ; - checkInputs = [ - poppler_utils - ]; passthru = { # So it will be easier to inspect this environment, in comparison to others inherit luaEnv; + # Copied from Makefile.am + tests.test = lib.optionalAttrs (!(stdenv.isDarwin && stdenv.isAarch64)) ( + runCommand "${pname}-test" + { + nativeBuildInputs = [ poppler_utils sile ]; + inherit FONTCONFIG_FILE; + } '' + output=$(mktemp -t selfcheck-XXXXXX.pdf) + echo "foo" | sile -o $output - + pdfinfo $output | grep "SILE v${version}" > $out + ''); }; postPatch = '' @@ -91,8 +101,6 @@ stdenv.mkDerivation rec { ]; }; - doCheck = true; - enableParallelBuilding = true; preBuild = lib.optionalString stdenv.cc.isClang '' @@ -106,7 +114,6 @@ stdenv.mkDerivation rec { outputs = [ "out" "doc" "man" "dev" ]; meta = with lib; { - broken = stdenv.isDarwin; description = "A typesetting system"; longDescription = '' SILE is a typesetting system; its job is to produce beautiful From 7de34eb2203f0215fb75ee5bfe6444ebbd43ba63 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 13 Jan 2023 20:19:33 +0000 Subject: [PATCH 17/33] arduino-language-server: 0.7.2 -> 0.7.4 --- .../embedded/arduino/arduino-language-server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/embedded/arduino/arduino-language-server/default.nix b/pkgs/development/embedded/arduino/arduino-language-server/default.nix index 6ed310649368..b1b4409ddc67 100644 --- a/pkgs/development/embedded/arduino/arduino-language-server/default.nix +++ b/pkgs/development/embedded/arduino/arduino-language-server/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "arduino-language-server"; - version = "0.7.2"; + version = "0.7.4"; src = fetchFromGitHub { owner = "arduino"; repo = "arduino-language-server"; rev = version; - hash = "sha256-7xuVCD27gE8uDFBTQgBwH8bx8OWc9Lj71o27FYOSiTY="; + hash = "sha256-A5JcHdcSrRC1BxoJsPtLKBq1fu58SvwHm9hbgu8Uy5k="; }; subPackages = [ "." ]; - vendorHash = "sha256-Xa26ilo95sQ/6dGvl4gB2bb0vzWXr+WPKLezAnZPeqM="; + vendorHash = "sha256-SKqorfgesYE0kXR/Fm6gI7Me0CxtDeNsTRGYuGJW+vo="; doCheck = false; From e38b57f07f2ab6b46a7992da741cd682ff6f1b51 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 14 Jan 2023 10:14:38 +0100 Subject: [PATCH 18/33] arduino-language-server: add changelog to meta --- .../arduino/arduino-language-server/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/embedded/arduino/arduino-language-server/default.nix b/pkgs/development/embedded/arduino/arduino-language-server/default.nix index b1b4409ddc67..61be34abf94e 100644 --- a/pkgs/development/embedded/arduino/arduino-language-server/default.nix +++ b/pkgs/development/embedded/arduino/arduino-language-server/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +}: buildGoModule rec { pname = "arduino-language-server"; @@ -7,7 +11,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "arduino"; repo = "arduino-language-server"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-A5JcHdcSrRC1BxoJsPtLKBq1fu58SvwHm9hbgu8Uy5k="; }; @@ -22,11 +26,14 @@ buildGoModule rec { "-w" "-X github.com/arduino/arduino-language-server/version.versionString=${version}" "-X github.com/arduino/arduino-language-server/version.commit=unknown" - ] ++ lib.optionals stdenv.isLinux [ "-extldflags '-static'" ]; + ] ++ lib.optionals stdenv.isLinux [ + "-extldflags '-static'" + ]; meta = with lib; { - inherit (src.meta) homepage; description = "An Arduino Language Server based on Clangd to Arduino code autocompletion"; + homepage = "https://github.com/arduino/arduino-language-server"; + changelog = "https://github.com/arduino/arduino-language-server/releases/tag/${version}": license = licenses.asl20; maintainers = with maintainers; [ BattleCh1cken ]; }; From 391d0cfb9622b95d64813746f6054651a6c342a9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 14 Jan 2023 11:27:37 +0100 Subject: [PATCH 19/33] arduino-language-server: fix typo --- .../embedded/arduino/arduino-language-server/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/embedded/arduino/arduino-language-server/default.nix b/pkgs/development/embedded/arduino/arduino-language-server/default.nix index 61be34abf94e..da3d1e7e7c60 100644 --- a/pkgs/development/embedded/arduino/arduino-language-server/default.nix +++ b/pkgs/development/embedded/arduino/arduino-language-server/default.nix @@ -33,7 +33,7 @@ buildGoModule rec { meta = with lib; { description = "An Arduino Language Server based on Clangd to Arduino code autocompletion"; homepage = "https://github.com/arduino/arduino-language-server"; - changelog = "https://github.com/arduino/arduino-language-server/releases/tag/${version}": + changelog = "https://github.com/arduino/arduino-language-server/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ BattleCh1cken ]; }; From 53760d1d64036c3795780414cb9e45532e1285b9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 14 Jan 2023 14:06:19 +0100 Subject: [PATCH 20/33] python310Packages.aliyun-python-sdk-cdn: 3.7.10 -> 3.7.11 Changelog: https://github.com/aliyun/aliyun-openapi-python-sdk/blob/master/aliyun-python-sdk-cdn/ChangeLog.txt --- .../python-modules/aliyun-python-sdk-cdn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix b/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix index f305aebecf5e..e11d085f0632 100644 --- a/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix +++ b/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "aliyun-python-sdk-cdn"; - version = "3.7.10"; + version = "3.7.11"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Zewi/LroLKFPCVYp2yBvn6gL/KAvbH5p8yNDxaHHTDY="; + hash = "sha256-k0+Ce/lZY00G9/q0FE9skUWqKiaWnHoEcfAqf4u6dko="; }; propagatedBuildInputs = [ From 5d24ec307fd6686791d013441fb7447668642a21 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 14 Jan 2023 14:06:38 +0100 Subject: [PATCH 21/33] python310Packages.aliyun-python-sdk-iot: 8.48.0 -> 8.49.0 Changelog: https://github.com/aliyun/aliyun-openapi-python-sdk/blob/master/aliyun-python-sdk-iot/ChangeLog.txt --- .../python-modules/aliyun-python-sdk-iot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix b/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix index 33380342178b..6a5802c388f9 100644 --- a/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix +++ b/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "aliyun-python-sdk-iot"; - version = "8.48.0"; + version = "8.49.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-iyywuAYDf3bY5He2rVgyjQcrD2MH123H6ham4xTAnXM="; + hash = "sha256-POrDx4xXCIOBU4hvXu03XcZI2F6xHsjHNJRBaGFC8U8="; }; propagatedBuildInputs = [ From 585f4335e43d09f8815a6326b52a74032ff081eb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 14 Jan 2023 15:12:23 +0100 Subject: [PATCH 22/33] python310Packages.tololib: add changelog to meta --- pkgs/development/python-modules/tololib/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/tololib/default.nix b/pkgs/development/python-modules/tololib/default.nix index 63720359dabd..e682460ac226 100644 --- a/pkgs/development/python-modules/tololib/default.nix +++ b/pkgs/development/python-modules/tololib/default.nix @@ -43,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python Library for Controlling TOLO Sauna/Steam Bath Devices"; homepage = "https://gitlab.com/MatthiasLohr/tololib"; + changelog = "https://gitlab.com/MatthiasLohr/tololib/-/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From 9abce2dd4f79db7dfaf3abd30b7d107cb72c74ae Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 14 Jan 2023 15:13:12 +0100 Subject: [PATCH 23/33] python310Packages.tololib: 0.1.0b3 -> 0.1.0b4 Diff: https://gitlab.com/MatthiasLohr/tololib/-/compare/v0.1.0b3...v0.1.0b4 Changelog: https://gitlab.com/MatthiasLohr/tololib/-/blob/v0.1.0b4/CHANGELOG.md --- pkgs/development/python-modules/tololib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tololib/default.nix b/pkgs/development/python-modules/tololib/default.nix index e682460ac226..d4ca96c82d08 100644 --- a/pkgs/development/python-modules/tololib/default.nix +++ b/pkgs/development/python-modules/tololib/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "tololib"; - version = "0.1.0b3"; + version = "0.1.0b4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "MatthiasLohr"; repo = pname; rev = "v${version}"; - sha256 = "qkdMy6/ZuBksbBTbDhPyCPWMjubQODjdMsqHTJ7QvQI="; + hash = "sha256-2OQaJR70bx8qWs1IPErF+B3X1iRvHW74axTqtdvum3U="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 55bf5657c4f5f311bb08ec77a9b2dba88fe74a6d Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 14 Jan 2023 23:47:48 +0800 Subject: [PATCH 24/33] gnome2.gnome_python_desktop: remove Unmaintained, depends on libgnome + python2 --- .../bindings/gnome-python-desktop/default.nix | 32 ------------------- pkgs/desktops/gnome-2/default.nix | 7 ++-- 2 files changed, 3 insertions(+), 36 deletions(-) delete mode 100644 pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix diff --git a/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix b/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix deleted file mode 100644 index a350c224e8a6..000000000000 --- a/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchurl, gnome_python, librsvg, libwnck2, libgtop, pkg-config, python2, gtk2 }: - -let - inherit (python2.pkgs) python pygtk; -in stdenv.mkDerivation rec { - ver_maj = "2.32"; - ver_min = "0"; - version = "${ver_maj}.${ver_min}"; - pname = "gnome-python-desktop"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-python-desktop/${ver_maj}/gnome-python-desktop-${version}.tar.bz2"; - sha256 = "1s8f9rns9v7qlwjv9qh9lr8crp88dpzfm45hj47zc3ivpy0dbnq9"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk2 librsvg libwnck2 libgtop python ]; - propagatedBuildInputs = [ gnome_python pygtk ]; - - # gnome-python-desktop expects that .pth file is already installed by PyGTK - # in the same directory. This is not the case for Nix. - postInstall = '' - echo "gtk-2.0" > $out/${python2.sitePackages}/${pname}-${version}.pth - ''; - - meta = with lib; { - homepage = "http://www.pygtk.org"; - description = "Python bindings for GNOME desktop packages"; - license = licenses.lgpl21; - maintainers = [ maintainers.goibhniu ]; - }; -} diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index 2082caf7f9d1..75ef97817c3a 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -35,8 +35,6 @@ lib.makeScope pkgs.newScope (self: with self; { gnome_python = callPackage ./bindings/gnome-python { }; - gnome_python_desktop = callPackage ./bindings/gnome-python-desktop { }; - gnome_vfs = callPackage ./platform/gnome-vfs { }; libgnome = callPackage ./platform/libgnome { }; @@ -72,7 +70,6 @@ lib.makeScope pkgs.newScope (self: with self; { gtk = pkgs.gtk2; gtkmm = pkgs.gtkmm2; - python_rsvg = self.gnome_python_desktop; gtkdoc = pkgs.gtk-doc; startup_notification = pkgs.libstartup_notification; @@ -82,5 +79,7 @@ lib.makeScope pkgs.newScope (self: with self; { gnome_icon_theme = self.gnome-icon-theme; gnomeicontheme = self.gnome-icon-theme; gnome_common = gnome-common; - libglademm = throw "libglademm has been removed"; # 2022-01-15 + gnome_python_desktop = throw "gnome2.gnome_python_desktop has been removed"; # 2023-01-14 + libglademm = throw "gnome2.libglademm has been removed"; # 2022-01-15 + python_rsvg = throw "gnome2.python_rsvg has been removed"; # 2023-01-14 }) From 24d48710d8cb4e4059070b5e362496c19d1a7ab1 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 14 Jan 2023 23:51:14 +0800 Subject: [PATCH 25/33] gnome2.gnome_python: remove Unmaintained, depends on libgnome + python2 --- .../gnome-2/bindings/gnome-python/default.nix | 33 ------------------- pkgs/desktops/gnome-2/default.nix | 3 +- 2 files changed, 1 insertion(+), 35 deletions(-) delete mode 100644 pkgs/desktops/gnome-2/bindings/gnome-python/default.nix diff --git a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix deleted file mode 100644 index 0c636ffa5417..000000000000 --- a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchurl, python2, pkg-config, libgnome, GConf, glib, gtk2, gnome_vfs }: - -with lib; - -let - inherit (python2.pkgs) python pygobject2 pygtk dbus-python; -in stdenv.mkDerivation rec { - pname = "gnome-python"; - version = "2.28.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-python/${lib.versions.majorMinor version}/gnome-python-${version}.tar.bz2"; - sha256 = "759ce9344cbf89cf7f8449d945822a0c9f317a494f56787782a901e4119b96d8"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ python glib gtk2 GConf libgnome gnome_vfs ]; - propagatedBuildInputs = [ pygobject2 pygtk dbus-python ]; - - # gnome-python expects that .pth file is already installed by PyGTK in the - # same directory. This is not the case for Nix. - postInstall = '' - echo "gtk-2.0" > $out/${python2.sitePackages}/gnome-python-${version}.pth - ''; - - meta = with lib; { - homepage = "http://pygtk.org/"; - description = "Python wrapper for GNOME libraries"; - platforms = platforms.linux; - license = licenses.lgpl2; - maintainers = with maintainers; [ qknight ]; - }; -} diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index 75ef97817c3a..3dfcc5190974 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -33,8 +33,6 @@ lib.makeScope pkgs.newScope (self: with self; { gnome_mime_data = callPackage ./platform/gnome-mime-data { }; - gnome_python = callPackage ./bindings/gnome-python { }; - gnome_vfs = callPackage ./platform/gnome-vfs { }; libgnome = callPackage ./platform/libgnome { }; @@ -79,6 +77,7 @@ lib.makeScope pkgs.newScope (self: with self; { gnome_icon_theme = self.gnome-icon-theme; gnomeicontheme = self.gnome-icon-theme; gnome_common = gnome-common; + gnome_python = throw "gnome2.gnome_python has been removed"; # 2023-01-14 gnome_python_desktop = throw "gnome2.gnome_python_desktop has been removed"; # 2023-01-14 libglademm = throw "gnome2.libglademm has been removed"; # 2022-01-15 python_rsvg = throw "gnome2.python_rsvg has been removed"; # 2023-01-14 From c7833a91da8cf7e5b3b8c14c4529676e3785c773 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 Jan 2023 16:19:21 +0000 Subject: [PATCH 26/33] owl-lisp: 0.2 -> 0.2.1 --- pkgs/development/compilers/owl-lisp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/owl-lisp/default.nix b/pkgs/development/compilers/owl-lisp/default.nix index 2471910fdb5b..c33c35e61427 100644 --- a/pkgs/development/compilers/owl-lisp/default.nix +++ b/pkgs/development/compilers/owl-lisp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "owl-lisp"; - version = "0.2"; + version = "0.2.1"; src = fetchFromGitLab { owner = "owl-lisp"; repo = "owl"; rev = "v${version}"; - sha256 = "sha256-G12yZxlq6Hss5j4Seq1hcPQWXMIeL2Z8VkBdmIGESX8="; + sha256 = "sha256-TQOj3DYmzFT4ClZ/sBAOs5XJWRgGTaVQjH+8JotSb1A="; }; nativeBuildInputs = [ which ]; From 654a3bf049f0aadb8569904ac106a59ff39f16fb Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 13 Jan 2023 17:32:47 -0500 Subject: [PATCH 27/33] process-viewer: 0.5.5 -> 0.5.6 --- pkgs/applications/misc/process-viewer/default.nix | 14 +++++--------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/misc/process-viewer/default.nix b/pkgs/applications/misc/process-viewer/default.nix index 442f9d0e9b50..528fe1aec0c8 100644 --- a/pkgs/applications/misc/process-viewer/default.nix +++ b/pkgs/applications/misc/process-viewer/default.nix @@ -4,28 +4,24 @@ , pkg-config , gtk4 , stdenv -, DiskArbitration -, Foundation -, IOKit +, darwin }: rustPlatform.buildRustPackage rec { pname = "process-viewer"; - version = "0.5.5"; + version = "0.5.6"; src = fetchCrate { inherit pname version; - sha256 = "sha256-MHVKjbD1/h7G94x6dpyRT/BPWQVUFurW7EvAUJ2xZeU="; + sha256 = "sha256-ELASfcXNhUCE/mhPKBHA78liFMbcT9RB/aoLt4ZRPa0="; }; - cargoSha256 = "sha256-NkJjwB4rBV4hFRwYHILMET8o4x1+95sVsFqNaVN8tMg="; + cargoSha256 = "sha256-K2kyZwKRALh9ImPngijgpoHyLS+c5sDYviN74JxhJLM="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk4 ] ++ lib.optionals stdenv.isDarwin [ - DiskArbitration - Foundation - IOKit + darwin.apple_sdk_11_0.frameworks.Foundation ]; postInstall = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b69a3da3c3e0..bc60cb391ce3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18044,9 +18044,7 @@ with pkgs; process-compose = callPackage ../applications/misc/process-compose { }; - process-viewer = callPackage ../applications/misc/process-viewer { - inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation IOKit; - }; + process-viewer = callPackage ../applications/misc/process-viewer { }; procodile = callPackage ../tools/system/procodile { }; From 89d4b2b4df27a62600fe45ee824643c59a28ed34 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 14 Jan 2023 20:02:56 +0100 Subject: [PATCH 28/33] wxmaxima: 22.05.0 -> 22.12.0 --- pkgs/applications/science/math/wxmaxima/default.nix | 11 +++++++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index aea24b84d1d4..205fe3ebed5d 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -7,17 +7,18 @@ , maxima , wxGTK , gnome +, glib }: stdenv.mkDerivation rec { pname = "wxmaxima"; - version = "22.05.0"; + version = "22.12.0"; src = fetchFromGitHub { owner = "wxMaxima-developers"; repo = "wxmaxima"; rev = "Version-${version}"; - sha256 = "sha256-pcKnEjJmvMXCBpjtOSLyl4I0x3fjh0os9Sdp39I2Re0="; + sha256 = "sha256-RT6y4M6LQD1fXJcjtdSXnDmoJvv160g2asdV4WtTcok="; }; buildInputs = [ @@ -25,6 +26,8 @@ stdenv.mkDerivation rec { maxima # So it won't embed svg files into headers. gnome.adwaita-icon-theme + # So it won't crash under Sway. + glib ]; nativeBuildInputs = [ @@ -33,6 +36,10 @@ stdenv.mkDerivation rec { gettext ]; + cmakeFlags = [ + "-DwxWidgets_LIBRARIES=${wxGTK}/lib" + ]; + preConfigure = '' gappsWrapperArgs+=(--prefix PATH ":" ${maxima}/bin) ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 212f49362096..50f0d7a9cb07 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36556,7 +36556,9 @@ with pkgs; }; wxmaxima = callPackage ../applications/science/math/wxmaxima { - wxGTK = wxGTK32; + wxGTK = wxGTK32.override { + withWebKit = true; + }; }; pari = callPackage ../applications/science/math/pari { tex = texlive.combined.scheme-basic; }; From c9913434a68e061acdc2a4e5c4b980c6e57a39f9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 Jan 2023 22:29:09 +0000 Subject: [PATCH 29/33] flyctl: 0.0.443 -> 0.0.447 --- pkgs/development/web/flyctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index c4e1dbf6b0a0..65098f631a54 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.443"; + version = "0.0.447"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-v4N2Li7AGPMMIfleJ6sk2fEwJ9cYXJeV6WcDp1rI0xY="; + sha256 = "sha256-JJk3lNNRzIrU/z45ePUin10gEW5KLvcPRy+NzcMHYRs="; }; - vendorHash = "sha256-l921q3RHyEZ6dx8gHThrC18IUChUOYvB+W5PYsE7Nu0="; + vendorHash = "sha256-xmad9HdcWr4BiMMfdO6Ua1nqpFCsFoLvtDfcKiRZYVM="; subPackages = [ "." ]; From d0a7e8e018cd0b7c26e561af4b4a90e018c7a069 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 15 Jan 2023 07:09:26 +1000 Subject: [PATCH 30/33] delta: add missing check input, skip test on darwin --- pkgs/applications/version-management/delta/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/version-management/delta/default.nix b/pkgs/applications/version-management/delta/default.nix index 1bdd028d8101..184a15d92c01 100644 --- a/pkgs/applications/version-management/delta/default.nix +++ b/pkgs/applications/version-management/delta/default.nix @@ -7,6 +7,7 @@ , Foundation , libiconv , Security +, git }: rustPlatform.buildRustPackage rec { @@ -26,12 +27,18 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration Foundation libiconv Security ]; + checkInputs = [ git ]; + postInstall = '' installShellCompletion --bash --name delta.bash etc/completion/completion.bash installShellCompletion --zsh --name _delta etc/completion/completion.zsh installShellCompletion --fish --name delta.fish etc/completion/completion.fish ''; + checkFlags = lib.optionals stdenv.isDarwin [ + "--skip=test_diff_same_non_empty_file" + ]; + meta = with lib; { homepage = "https://github.com/dandavison/delta"; description = "A syntax-highlighting pager for git"; From b40f0196f35a53d54b27dfdd023b1f79b4a075d7 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 15 Jan 2023 02:50:59 +0100 Subject: [PATCH 31/33] megam: add darwin support (#209898) Co-authored-by: Sandro --- pkgs/applications/science/misc/megam/default.nix | 13 +++++++++---- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/science/misc/megam/default.nix b/pkgs/applications/science/misc/megam/default.nix index 6c55027d3c6f..044f9ae56d05 100644 --- a/pkgs/applications/science/misc/megam/default.nix +++ b/pkgs/applications/science/misc/megam/default.nix @@ -12,11 +12,16 @@ stdenv.mkDerivation { patches = [ ./ocaml-includes.patch ./ocaml-3.12.patch ]; - buildInputs = [ ocaml ncurses ]; + strictDeps = true; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ocaml ]; - makeFlags = [ "CAML_INCLUDES=${ocaml}/lib/ocaml/caml" ]; + buildInputs = [ ncurses ]; + + makeFlags = [ + "CAML_INCLUDES=${ocaml}/lib/ocaml/caml" + "WITHBIGARRAY=bigarray.cma" + ]; # see https://bugzilla.redhat.com/show_bug.cgi?id=435559 dontStrip = true; @@ -42,6 +47,6 @@ stdenv.mkDerivation { license = "non-commercial"; maintainers = [ ]; - platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice + platforms = lib.platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b1c922c46594..c9d714468bff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36752,9 +36752,7 @@ with pkgs; wxGTK = wxGTK32; }; - megam = callPackage ../applications/science/misc/megam { - inherit (ocaml-ng.ocamlPackages_4_07) ocaml; - }; + megam = callPackage ../applications/science/misc/megam { }; netlogo = callPackage ../applications/science/misc/netlogo { }; From 7875a11bd6ed9b70de960a70724c1a4f90dc1ea8 Mon Sep 17 00:00:00 2001 From: "Matthew \"strager\" Glazar" Date: Sat, 14 Jan 2023 15:48:31 -0800 Subject: [PATCH 32/33] sapling: use latest Python After upgrading to Sapling 0.2.20221222-152408-ha6a66d09, we no longer need a specific version of Python. Use the Nixpkgs default. --- .../version-management/sapling/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/version-management/sapling/default.nix b/pkgs/applications/version-management/sapling/default.nix index 2e8d735fa0e5..8873e8c4718e 100644 --- a/pkgs/applications/version-management/sapling/default.nix +++ b/pkgs/applications/version-management/sapling/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, python38Packages +, python3Packages , fetchFromGitHub , fetchurl , sd @@ -90,11 +90,7 @@ let }; # Builds the main `sl` binary and its Python extensions - # - # FIXME(lf-): when next updating this package, delete the python 3.8 override - # here, since the fix for https://github.com/facebook/sapling/issues/279 that - # required it will be in the next release. - sapling = python38Packages.buildPythonPackage { + sapling = python3Packages.buildPythonPackage { pname = "sapling-main"; inherit src version; @@ -135,7 +131,7 @@ let # so that 'sl web' always works # 4) 'sl web' will still work if 'nodejs' is in $PATH, just not OOTB preFixup = '' - sitepackages=$out/lib/${python38Packages.python.libPrefix}/site-packages + sitepackages=$out/lib/${python3Packages.python.libPrefix}/site-packages chmod +w $sitepackages cp -r ${isl} $sitepackages/edenscm-isl '' + lib.optionalString (!enableMinimal) '' From 4aba481aef5eb020659245e550e6a1a2b338d680 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 15 Jan 2023 03:55:36 +0000 Subject: [PATCH 33/33] geographiclib: 2.1.1 -> 2.1.2 --- pkgs/development/libraries/geographiclib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/geographiclib/default.nix b/pkgs/development/libraries/geographiclib/default.nix index 44576daaf440..d6a8879f671a 100644 --- a/pkgs/development/libraries/geographiclib/default.nix +++ b/pkgs/development/libraries/geographiclib/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "geographiclib"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "geographiclib"; repo = "geographiclib"; rev = "v${version}"; - hash = "sha256-7K4vI5vNSGPo2d9QNmasjJa4oMDfE8WTW6Guk2604Yg="; + hash = "sha256-DVJi6EosJOPoVJEgZYsro5C/lrHrXEfbjLWiQVJk4+U="; }; nativeBuildInputs = [ cmake doxygen ];