diff options
30 files changed, 328 insertions, 389 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index 2eaedf852098..f6a37b92a098 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -142,6 +142,8 @@ In addition to numerous new and upgraded packages, this release has the followin - `vim_configurable` has been renamed to `vim-full` to avoid confusion: `vim-full`'s build-time features are configurable, but both `vim` and `vim-full` are _customizable_ (in the sense of user configuration, like vimrc). +- Pantheon now defaults to Mutter 42 and GNOME settings daemon 42, all Pantheon packages are now tracking elementary OS 7 updates. + - The module for the application firewall `opensnitch` got the ability to configure rules. Available as [services.opensnitch.rules](#opt-services.opensnitch.rules) - The module `usbmuxd` now has the ability to change the package used by the daemon. In case you're experiencing issues with `usbmuxd` you can try an alternative program like `usbmuxd2`. Available as [services.usbmuxd.package](#opt-services.usbmuxd.package) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 8a19ce2a2dd4..739b0b687fbd 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -927,8 +927,8 @@ let mktplcRef = { name = "gitlens"; publisher = "eamodio"; - version = "2023.2.1404"; - sha256 = "sha256-hszwiETLDKqV4yqchPA1o3WuAgvmY2AwslvvbAhkRCE="; + version = "2023.2.2804"; + sha256 = "sha256-3jQ0CpAGrPLQPpwZx2u3ylfOwy6cBu7WLr0w3h8IM2Y="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog"; diff --git a/pkgs/applications/file-managers/lf/ctpv.nix b/pkgs/applications/file-managers/lf/ctpv.nix new file mode 100644 index 000000000000..7f5e2a6e089e --- /dev/null +++ b/pkgs/applications/file-managers/lf/ctpv.nix @@ -0,0 +1,41 @@ +{ lib +, pkgs +, file +, openssl +, stdenv +, fetchFromGitHub +, waylandSupport ? stdenv.isLinux +, x11Support ? stdenv.isLinux +}: + +stdenv.mkDerivation rec { + pname = "ctpv"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "NikitaIvanovV"; + repo = "${pname}"; + rev = "v${version}"; + hash = "sha256-0OuskRCBVm8vMd2zH5u5EPABmCOlEv5N4ZZMdc7bAwM="; + }; + + nativeBuildInputs = [ + file # libmagic + openssl + ]; + + buildInputs = with pkgs; [ + ffmpegthumbnailer ffmpeg + ] ++ lib.optional waylandSupport [ chafa ] + ++ lib.optional x11Support [ ueberzug ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with lib; { + description = "Image previews for lf (list files) file manager"; + homepage = "https://github.com/NikitaIvanovV/ctpv"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.wesleyjrz ]; + }; +} diff --git a/pkgs/applications/networking/cluster/clusterctl/default.nix b/pkgs/applications/networking/cluster/clusterctl/default.nix index 69862bd51559..3f614815f7a5 100644 --- a/pkgs/applications/networking/cluster/clusterctl/default.nix +++ b/pkgs/applications/networking/cluster/clusterctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clusterctl"; - version = "1.3.3"; + version = "1.3.4"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${version}"; - hash = "sha256-O/InVEWSqdcfqchVMYetZ3RCOxgEjQ9XvnKpOIjV2zE="; + hash = "sha256-bkjtJidG+UHma15axlLcXtqtWTqesOdHHmH4db5hoAY="; }; - vendorHash = "sha256-0C3tQgmu7YQgHyXh8lIYTrLFksCvFQp0uvIhQRuqbYM="; + vendorHash = "sha256-VPeaT4vPhBa6V+Ir+vNRIWgyVBzEgTDSnDtGrxxdZ0c="; subPackages = [ "cmd/clusterctl" ]; @@ -39,6 +39,7 @@ buildGoModule rec { }; meta = with lib; { + changelog = "https://github.com/kubernetes-sigs/cluster-api/releases/tag/${src.rev}"; description = "Kubernetes cluster API tool"; homepage = "https://cluster-api.sigs.k8s.io/"; license = licenses.asl20; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 114bf808bcbc..6e858269bd77 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -328,13 +328,13 @@ "vendorHash": "sha256-Ba4J6LUchqhdZTxcJxTgP20aZVioybIzKvF4j5TDQIk=" }, "dnsimple": { - "hash": "sha256-P1mvxRbOSmQknQxFPEyAkpK5eZQq286oceRFbrgYYqg=", + "hash": "sha256-AbNOqxZOrXUxkuScOgrZ3OyEHWpZ8+tsqqXW6lofaMc=", "homepage": "https://registry.terraform.io/providers/dnsimple/dnsimple", "owner": "dnsimple", "repo": "terraform-provider-dnsimple", - "rev": "v0.15.0", + "rev": "v0.16.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-z0vos/tZDUClK/s2yrXZG2RU8QgA8IM6bJj6jSdCnBk=" + "vendorHash": "sha256-rGcCbESdzKGy3I1FcDA3dUbblyG/uk74rizj7INRGPw=" }, "docker": { "hash": "sha256-M2K4N39vtVDA/vMp/s2KYiS/uoE+STf2e6yh6q0CS28=", @@ -648,13 +648,13 @@ "vendorHash": null }, "launchdarkly": { - "hash": "sha256-3zQN7cc4p5ivjPxiIqdv6e/m+2KnhwiLhwSa6RAQ1sk=", + "hash": "sha256-7m5+Fu9UjmGWL4PgYCpI9vMStfmU4oQ1cx+7wAirEbQ=", "homepage": "https://registry.terraform.io/providers/launchdarkly/launchdarkly", "owner": "launchdarkly", "repo": "terraform-provider-launchdarkly", - "rev": "v2.10.0", + "rev": "v2.11.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-x5C+WimWRBJQiOwsy+Woop1U6a7nSnO0rDoy4UU6j+4=" + "vendorHash": "sha256-j8Lit22aWeLvYrq5ao0nIdcVZDSxaAKaW+bxQ/JCSgE=" }, "libvirt": { "hash": "sha256-VO9fbRLz7mDYT8WORodnN4l3II2j+TdpV8cZ9M+NjTM=", @@ -964,13 +964,13 @@ "vendorHash": null }, "scaleway": { - "hash": "sha256-sUYRsh1t4y9SNdt0QzhP1BM3CglxYy/ciZAEGCLj7c8=", + "hash": "sha256-rkDNV58mN/7pgQC1WBnrggHtq7q3O7r3v+huB4oPVLM=", "homepage": "https://registry.terraform.io/providers/scaleway/scaleway", "owner": "scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.11.1", + "rev": "v2.12.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-e/Pqu58ngWnoMKjDKEUm49e0D0PfYEqxm/BxfN8UX3c=" + "vendorHash": "sha256-zice1rGuZH9kmQJQ8RdIONJXVXu1BIuRUKjTGLPK7Ns=" }, "secret": { "hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=", @@ -1027,11 +1027,11 @@ "vendorHash": null }, "snowflake": { - "hash": "sha256-gXi/S+DMPU0RROYtrLkV7eIgpQMDaFwz5uCeeoe51L4=", + "hash": "sha256-nNv2lo7I5+eFmw+BvRB/DmgNE6iuR3Aq0kxyOeQdiqU=", "homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake", "owner": "Snowflake-Labs", "repo": "terraform-provider-snowflake", - "rev": "v0.56.5", + "rev": "v0.57.0", "spdx": "MIT", "vendorHash": "sha256-yFk5ap28JluaKkUPfePBuRUEg6/Ma5MrRkmWK6iAGNg=" }, diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix index 38a15e8bef01..e602e6e5af7f 100644 --- a/pkgs/applications/office/portfolio/default.nix +++ b/pkgs/applications/office/portfolio/default.nix @@ -27,11 +27,11 @@ let in stdenv.mkDerivation rec { pname = "PortfolioPerformance"; - version = "0.61.0"; + version = "0.61.3"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - hash = "sha256-lpKnhAF/VsbLOHkIy1TFqjT0yKlFMNsN+yMUmpBAZKY="; + hash = "sha256-OtFHTZQ+K3CQPEcuirvp8MmW9IC5lEpg42A6FSZVTTA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 6e6a6434ed80..d5fb7df67f70 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "containerd"; - version = "1.6.18"; + version = "1.6.19"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - hash = "sha256-ApQKdd+S02YFNDVrrSKVHZmR1ZQwcU1KoQRfhOP9VHQ="; + hash = "sha256-Us7NEv2BngV1Q/Bkuv4XOjVjpqThL0LnIH+yciPG3L8="; }; vendorHash = null; @@ -45,6 +45,7 @@ buildGoModule rec { passthru.tests = { inherit (nixosTests) docker; }; meta = with lib; { + changelog = "https://github.com/containerd/containerd/releases/tag/${src.rev}"; homepage = "https://containerd.io/"; description = "A daemon to control runC"; license = licenses.asl20; diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/3.38/default.nix b/pkgs/desktops/gnome/core/gnome-settings-daemon/42/default.nix index 4a09956c4b54..e05040cc6e4c 100644 --- a/pkgs/desktops/gnome/core/gnome-settings-daemon/3.38/default.nix +++ b/pkgs/desktops/gnome/core/gnome-settings-daemon/42/default.nix @@ -39,16 +39,15 @@ , nss , gcr , gnome-session-ctl -, pantheon }: stdenv.mkDerivation rec { pname = "gnome-settings-daemon"; - version = "3.38.2"; + version = "42.2"; src = fetchurl { - url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "136p3prdqvc0lvrcqs4h7crpnfqnimqklpzjivq5w4g1rhbdbhrj"; + url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "nESXFKqOwSccDbUTffNFgZWUPwXM0KyJNdkzl3cLqwA="; }; patches = [ @@ -63,37 +62,6 @@ stdenv.mkDerivation rec { inherit tzdata; }) - # Adjust to libgweather changes. - # https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/217 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/commit/82d88014dfca2df7e081712870e1fb017c16b808.patch"; - sha256 = "H5k/v+M2bRaswt5nrDJFNn4gS4BdB0UfzdjUCT4yLKg="; - }) - - # Fix build with new meson - # plugins/power/meson.build:78:7: ERROR: Function does not take positional arguments. - # https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/283 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/afa7e4bb9c519e2daf500a6079088669500768c0.patch"; - sha256 = "8wxJIKPoZyfs1t0zAsb5SVCdt297NUiGmXIBNI6hbCQ="; - }) - # meson.build:86:3: ERROR: The `==` operator of str does not accept objects of type bool (True) - # https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/249 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/28e28e9e598342c897ae5ca350d0da6f4aea057b.diff"; - sha256 = "U+suR7wYjLWPqmkJpHm6pPOWL7sjL6GhIFX8MHrBRAY="; - }) - - # Port to gweather4 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/66cae69ad82cfc59435016fba737ce046ffb7e66.patch"; - sha256 = "zf8/rkKdQQFNV/qx/jo4kx1KoLl7SUSu4/T1OBGrZ4c="; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/f390e6e9d56ce7d3e3a725b8204d81c0b6240515.patch"; - sha256 = "8mfnlhkSF9ogjVWE+IESzRQzrxHQSwUWsq5OLBM08iM="; - }) - # Use geocode-glib_2 dependency # https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/300 (fetchpatch { diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/3.38/fix-paths.patch b/pkgs/desktops/gnome/core/gnome-settings-daemon/42/fix-paths.patch index 2229302cab7c..2229302cab7c 100644 --- a/pkgs/desktops/gnome/core/gnome-settings-daemon/3.38/fix-paths.patch +++ b/pkgs/desktops/gnome/core/gnome-settings-daemon/42/fix-paths.patch diff --git a/pkgs/desktops/gnome/core/mutter/3.38/drop-inheritable.patch b/pkgs/desktops/gnome/core/mutter/3.38/drop-inheritable.patch deleted file mode 100644 index 7374e1b86935..000000000000 --- a/pkgs/desktops/gnome/core/mutter/3.38/drop-inheritable.patch +++ /dev/null @@ -1,132 +0,0 @@ -From e9c772e265b2293af031c79f4bbc99b5847dfe3c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com> -Date: Sat, 19 Oct 2019 13:26:05 +0200 -Subject: [PATCH] drop inheritable - -Adapted from https://gitlab.gnome.org/GNOME/mutter/commit/c53c47ae123b03cc66044d2b846342123ecb3a01 - -We only want to drop inheritable though, to prevent the ambient set leaking further than gnome-shell. - ---- - config.h.meson | 3 +++ - meson.build | 5 +++++ - meson_options.txt | 6 ++++++ - src/core/main.c | 11 +++++++++++ - src/meson.build | 1 + - 5 files changed, 26 insertions(+) - -diff --git a/config.h.meson b/config.h.meson -index 0bab71848..202fb7ed1 100644 ---- a/config.h.meson -+++ b/config.h.meson -@@ -58,6 +58,9 @@ - /* Xwayland applications allowed to issue keyboard grabs */ - #mesondefine XWAYLAND_GRAB_DEFAULT_ACCESS_RULES - -+/* Defined if libcap-ng is available */ -+#mesondefine HAVE_LIBCAPNG -+ - /* XKB base prefix */ - #mesondefine XKB_BASE - -diff --git a/meson.build b/meson.build -index 3322bd3b1..01c8020fa 100644 ---- a/meson.build -+++ b/meson.build -@@ -35,6 +35,7 @@ libstartup_notification_req = '>= 0.7' - libcanberra_req = '>= 0.26' - libwacom_req = '>= 0.13' - atk_req = '>= 2.5.3' -+libcapng_req = '>= 0.7.9' - - # optional version requirements - udev_req = '>= 228' -@@ -131,6 +131,7 @@ ice_dep = dependency('ice') - atk_dep = dependency('atk', version: atk_req) - libcanberra_dep = dependency('libcanberra', version: libcanberra_req) - dbus_dep = dependency('dbus-1') -+libcapng_dep = dependency('libcap-ng', required: get_option('libcapng')) - - # For now always require X11 support - have_x11 = true -@@ -256,6 +258,7 @@ have_core_tests = false - have_cogl_tests = false - have_clutter_tests = false - have_installed_tests = false -+have_libcapng = libcapng_dep.found() - - if have_tests - have_core_tests = get_option('core_tests') -@@ -361,6 +364,7 @@ cdata.set('HAVE_LIBWACOM', have_libwacom) - cdata.set('HAVE_SM', have_sm) - cdata.set('HAVE_STARTUP_NOTIFICATION', have_startup_notification) - cdata.set('HAVE_INTROSPECTION', have_introspection) -+cdata.set('HAVE_LIBCAPNG', have_libcapng) - cdata.set('HAVE_PROFILER', have_profiler) - - xkb_base = xkeyboard_config_dep.get_pkgconfig_variable('xkb_base') -@@ -465,6 +465,7 @@ output = [ - ' Introspection............ ' + have_introspection.to_string(), - ' Profiler................. ' + have_profiler.to_string(), - ' Xwayland initfd.......... ' + have_xwayland_initfd.to_string(), -+ ' libcap-ng................ ' + have_libcapng.to_string(), - '', - ' Tests:', - '', -diff --git a/meson_options.txt b/meson_options.txt -index 73aa7adde..8bfaacd9a 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -152,3 +152,9 @@ option('xwayland_grab_default_access_rules', - value: 'gnome-boxes,remote-viewer,virt-viewer,virt-manager,vinagre,vncviewer,Xephyr', - description: 'Comma delimited list of applications ressources or class allowed to issue X11 grabs in Xwayland' - ) -+ -+option('libcapng', -+ type: 'feature', -+ value: 'auto', -+ description: 'Enable libcap-ng support' -+) -diff --git a/src/core/main.c b/src/core/main.c -index 7f4f666d2..b27968f13 100644 ---- a/src/core/main.c -+++ b/src/core/main.c -@@ -66,6 +66,10 @@ - #include <girepository.h> - #endif - -+#ifdef HAVE_LIBCAPNG -+#include <cap-ng.h> -+#endif -+ - #if defined(HAVE_NATIVE_BACKEND) && defined(HAVE_WAYLAND) - #include <systemd/sd-login.h> - #endif /* HAVE_WAYLAND && HAVE_NATIVE_BACKEND */ -@@ -670,5 +674,12 @@ int - meta_run (void) - { - meta_start (); -+ -+#ifdef HAVE_LIBCAPNG -+ capng_clear(CAPNG_SELECT_BOTH); -+ capng_update(CAPNG_ADD, CAPNG_EFFECTIVE|CAPNG_PERMITTED, CAP_SYS_NICE); -+ capng_apply(CAPNG_SELECT_BOTH); -+#endif -+ - meta_run_main_loop (); - meta_finalize (); -diff --git a/src/meson.build b/src/meson.build -index 90d80734f..a9fffa2c2 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -18,6 +18,7 @@ mutter_pkg_deps = [ - glib_dep, - gsettings_desktop_schemas_dep, - gtk3_dep, -+ libcapng_dep, - pango_dep, - ] - --- -2.23.0 - diff --git a/pkgs/desktops/gnome/core/mutter/3.38/fix-glitches-in-gala.patch b/pkgs/desktops/gnome/core/mutter/3.38/fix-glitches-in-gala.patch deleted file mode 100644 index 973768239792..000000000000 --- a/pkgs/desktops/gnome/core/mutter/3.38/fix-glitches-in-gala.patch +++ /dev/null @@ -1,27 +0,0 @@ -From a58ace29db48f98ad59f4f309d49b458c68a6eec Mon Sep 17 00:00:00 2001 -From: Bobby Rong <rjl931189261@126.com> -Date: Wed, 28 Jul 2021 22:08:11 +0800 -Subject: [PATCH] Fix glitches in gala - -Co-Authored-By: WORLDofPEACE <worldofpeace@protonmail.ch> - -This fixes issues for users of mutter like in gala[0]. - -Upstream report: https://gitlab.gnome.org/GNOME/mutter/issues/536 -[0]: https://github.com/elementary/gala/issues/605 ---- - clutter/clutter/clutter-actor.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/clutter/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c -index febfb31918..71906000c0 100644 ---- a/clutter/clutter/clutter-actor.c -+++ b/clutter/clutter/clutter-actor.c -@@ -15926,7 +15926,6 @@ _clutter_actor_get_paint_volume_mutable (ClutterActor *self) - if (_clutter_actor_get_paint_volume_real (self, &priv->paint_volume)) - { - priv->paint_volume_valid = TRUE; -- priv->needs_paint_volume_update = FALSE; - return &priv->paint_volume; - } - else diff --git a/pkgs/desktops/gnome/core/mutter/3.38/default.nix b/pkgs/desktops/gnome/core/mutter/42/default.nix index 464cd285a780..b2c1ccc43b1c 100644 --- a/pkgs/desktops/gnome/core/mutter/3.38/default.nix +++ b/pkgs/desktops/gnome/core/mutter/42/default.nix @@ -15,6 +15,7 @@ , zenity , libcanberra , ninja +, xvfb-run , xkeyboard_config , libxkbfile , libXdamage @@ -47,32 +48,16 @@ let self = stdenv.mkDerivation rec { pname = "mutter"; - version = "3.38.6"; + version = "42.7"; outputs = [ "out" "dev" "man" ]; src = fetchurl { - url = "mirror://gnome/sources/mutter/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0mxln9azl4krmknq2vmhd15lgpa2q7gh7whiv14nsqbr9iaxmg2x"; + url = "mirror://gnome/sources/mutter/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "OwmmsHDRMHwD2EMorIS0+m1jmfk4MEo4wpTxso3yipM="; }; patches = [ - # Drop inheritable cap_sys_nice, to prevent the ambient set from leaking - # from mutter/gnome-shell, see https://github.com/NixOS/nixpkgs/issues/71381 - ./drop-inheritable.patch - - # Fixes issues for users of mutter like in gala. - # https://github.com/elementary/gala/issues/605 - # https://gitlab.gnome.org/GNOME/mutter/issues/536 - ./fix-glitches-in-gala.patch - - # Stop using source_root()/build_root(). - # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1957 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/6288763671692edbc953a2b80225e9a7c7fc87e7.patch"; - sha256 = "immnfZiY+Cgu7xTbo5y8xs0olTa6UGsKgDJ1Xhkhns0="; - }) - # Fix build with separate sysprof. # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2572 (fetchpatch { @@ -111,6 +96,7 @@ let self = stdenv.mkDerivation rec { mesa # needed for gbm meson ninja + xvfb-run pkg-config python3 wrapGAppsHook @@ -156,7 +142,7 @@ let self = stdenv.mkDerivation rec { PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev"; passthru = { - libdir = "${self}/lib/mutter-7"; + libdir = "${self}/lib/mutter-10"; tests = { libdirExists = runCommand "mutter-libdir-exists" {} '' diff --git a/pkgs/desktops/gnome/core/mutter/3.38/fix-paths.patch b/pkgs/desktops/gnome/core/mutter/42/fix-paths.patch index 6ac0a431f61f..6ac0a431f61f 100644 --- a/pkgs/desktops/gnome/core/mutter/3.38/fix-paths.patch +++ b/pkgs/desktops/gnome/core/mutter/42/fix-paths.patch diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index ae8bc2bc1302..155d8413ee2a 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -75,8 +75,8 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-settings-daemon = callPackage ./core/gnome-settings-daemon { }; - # Using 3.38 to match Mutter used in Pantheon - gnome-settings-daemon338 = callPackage ./core/gnome-settings-daemon/3.38 { }; + # Using 42 to match Mutter used in Pantheon + gnome-settings-daemon42 = callPackage ./core/gnome-settings-daemon/42 { }; gnome-software = callPackage ./core/gnome-software { }; @@ -96,8 +96,8 @@ lib.makeScope pkgs.newScope (self: with self; { mutter = callPackage ./core/mutter { }; - # Needed for elementary's gala and greeter until support for higher versions is provided - mutter338 = callPackage ./core/mutter/3.38 { }; + # Needed for elementary's gala, wingpanel and greeter until support for higher versions is provided + mutter42 = callPackage ./core/mutter/42 { }; nautilus = callPackage ./core/nautilus { }; @@ -271,4 +271,6 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-documents = throw "The ‘gnome.gnome-documents’ package was removed as it is broken and abandoned."; # added 2022-10-26 gnome-devel-docs = throw "The ‘gnome.gnome-devel-docs’ package was removed as it is outdated and no longer relevant."; # added 2022-10-26 + mutter338 = throw "The ‘gnome.mutter338’ package was removed as it is no longer needed by Pantheon."; # added 2023-02-22 + gnome-settings-daemon338 = throw "The ‘gnome.gnome-settings-daemon338’ package was removed as it is no longer needed by Pantheon."; # added 2023-02-22 } diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix index 5ff6a7de4b05..0b9c3213b3d2 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , substituteAll , meson @@ -39,19 +38,6 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; inherit ibus onboard libgnomekbd; }) - - # Revert schema key change that requires new GSD and Gala. - # TODO(@bobby285271): drop these in #196511. - (fetchpatch { - url = "https://github.com/elementary/switchboard-plug-keyboard/commit/555e9650bb8f74a7664e2393c589fe6664954a88.patch"; - sha256 = "sha256-koSTYLPRh9rOyxmJPtrj/fPuu2jb1SKZu6BwKsMvAmc="; - revert = true; - }) - (fetchpatch { - url = "https://github.com/elementary/switchboard-plug-keyboard/commit/6ebd57673b45cc64e1caf895134efc0d5f6cf2be.patch"; - sha256 = "sha256-Ezsh0t1/909MHCB2EJEnl4kcnXngshNYgrmqUQsfsaY="; - revert = true; - }) ]; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix index b71f6ee36ac5..160319f0e160 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-mouse-touchpad"; - version = "6.1.0"; + version = "7.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "0nqgbpk1knvbj5xa078i0ka6lzqmaaa873gwj3mhjr5q2gzkw7y5"; + sha256 = "sha256-iXkNdUMHa0IF2FLn34/6G4w3m53GRZun8yzc8dxAg20="; }; patches = [ diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index defa583e98a2..a96cce755c97 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -40,10 +40,10 @@ lib.makeScope pkgs.newScope (self: with self; { maintainers = lib.teams.pantheon.members; - mutter = pkgs.gnome.mutter338; + mutter = pkgs.gnome.mutter42; - # Using 3.38 to match Mutter used in Pantheon - gnome-settings-daemon = pkgs.gnome.gnome-settings-daemon338; + # Using 42 to match Mutter used in Pantheon + gnome-settings-daemon = pkgs.gnome.gnome-settings-daemon42; elementary-gsettings-schemas = callPackage ./desktop/elementary-gsettings-schemas { }; diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix index 85e0f1a28fc4..e02129cc8c08 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "elementary-default-settings"; - version = "6.0.2"; + version = "7.0.1"; src = fetchFromGitHub { owner = "elementary"; repo = "default-settings"; rev = version; - sha256 = "sha256-qaPj/Qp7RYzHgElFdM8bHV42oiPUbCMTC9Q+MUj4Q6Y="; + sha256 = "sha256-RPnERK93GCfWyw1sIW5BitCIo11/t1koV4r1+NF5NdI="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix index 94d461a590ac..f249a091572b 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix @@ -1,58 +1,44 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , pkg-config , meson , ninja , vala -, libxml2 , desktop-file-utils -, gtk3 +, gtk4 , glib -, granite +, granite7 , libgee -, libhandy -, wrapGAppsHook +, wrapGAppsHook4 }: stdenv.mkDerivation rec { pname = "elementary-shortcut-overlay"; - version = "1.2.1"; + version = "2.0.1"; src = fetchFromGitHub { owner = "elementary"; repo = "shortcut-overlay"; rev = version; - sha256 = "sha256-qmqzGCM3cVM6y80pzjm5CCyG6BO6XlKZiODAAEnwVrM="; + sha256 = "sha256-YVeCO7mZmf+FEY4d8tvC76lW/HkOwQ6kw7nvmzAFEtw="; }; - patches = [ - # Fix build with meson 0.61 - # https://github.com/elementary/shortcut-overlay/pull/113 - (fetchpatch { - url = "https://github.com/elementary/shortcut-overlay/commit/130f78eb4b7770586ea98ba0a5fdbbf5bb116f3f.patch"; - sha256 = "sha256-XXWq9CEv3Z2B8ogcFQAJZCfy19XxNHs3c8NToE2m/aA="; - }) - ]; - nativeBuildInputs = [ desktop-file-utils - libxml2 meson ninja pkg-config vala - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ glib - granite - gtk3 + granite7 + gtk4 libgee - libhandy ]; passthru = { diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index 2a6c79666b3f..89e035d86901 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , pkg-config , meson @@ -26,83 +25,19 @@ stdenv.mkDerivation rec { pname = "gala"; - version = "6.3.1"; + version = "7.0.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-7RZt6gA3wyp1cxIWBYFK+fYFSZDbjHcwYa2snOmDw1Y="; + sha256 = "sha256-YHmmF9tYDgMieLCs9My7NU16Ysq4n2sxWT/7MpaerkI="; }; patches = [ # We look for plugins in `/run/current-system/sw/lib/` because # there are multiple plugin providers (e.g. gala and wingpanel). ./plugins-dir.patch - - # WindowManager: save/restore easing on workspace switch - # https://github.com/elementary/gala/pull/1430 - (fetchpatch { - url = "https://github.com/elementary/gala/commit/1f94db16c627f73af5dc69714611815e4691b5e8.patch"; - sha256 = "sha256-PLNbAXyOG0TMn1y2QIBnL6BOQVqBA+DBgPOVJo4nDr8="; - }) - - # WindowSwitcher: fix initial alt-tab switcher indicator visibility - # https://github.com/elementary/gala/pull/1417 - (fetchpatch { - url = "https://github.com/elementary/gala/commit/e0095415cdbfc369e6482e84b8aaffc6a04cafe7.patch"; - sha256 = "sha256-n/BJPIrUaCQtBgDotOLq/bCAAccdbL6OwciXY115HsM="; - }) - - # MultitaskingView: fix allocation assertions - # https://github.com/elementary/gala/pull/1463 - (fetchpatch { - url = "https://github.com/elementary/gala/commit/23c7edeb0ee9b0ff0aa48c1d19fbd1739df7af78.patch"; - sha256 = "sha256-OfIDBfVEZoY8vMu9F8gtfRg4TYA1MUAG94BSOBKVGcI="; - }) - - # Work around crash when receiving notifications - # https://github.com/elementary/gala/pull/1497 - (fetchpatch { - url = "https://github.com/elementary/gala/commit/8842e576e3e8643a018d506605f80d152e3f5cec.patch"; - sha256 = "sha256-xu9Rh7TH0ccRU1TInTNTm+dDaCXj5aaEwDw3rBW02q8="; - }) - - # ShadowEffect: let Clutter know the shadow's size - # https://github.com/elementary/gala/pull/1500 - (fetchpatch { - url = "https://github.com/elementary/gala/commit/34a208e26d2ee0bf4a1689c8ad6ddfc06c540ff8.patch"; - sha256 = "sha256-KPIXNWTlKGc3JImt82t5lmcMu0bqrPx1JNv+TbsxhOg="; - }) - - # Fix awkward two-finger scroll in multitasking view - # https://github.com/elementary/gala/pull/1499 - (fetchpatch { - url = "https://github.com/elementary/gala/commit/c175d2662dd05e940a5b3311cc9dc285242b7fc5.patch"; - sha256 = "sha256-xsxYDagPmaNSZO/Cj7NjPqBHCc1hrqvpboAvPIg9P58="; - }) - - # Fix crash when monitor is turned off - # https://github.com/elementary/gala/pull/1491 - (fetchpatch { - url = "https://github.com/elementary/gala/commit/1487660812a343e6a6178881e6e7b25c2405cece.patch"; - sha256 = "sha256-YsRaWmDSg0h0RFTUOoMxlNcKoA4MNa8AhW1GGmk8qLA="; - }) - - # Fix quick zooming (next 3 patches) - # https://github.com/elementary/gala/pull/1501 - (fetchpatch { - url = "https://github.com/elementary/gala/commit/b9c5c9c79a045c3eef7695f74f82d851438ba7e2.patch"; - sha256 = "sha256-PGjf/B/7UQxpW0Pby7ZXuMoDlamZwEaDvaN9PaRulHU="; - }) - (fetchpatch { - url = "https://github.com/elementary/gala/commit/49d3ddae5b631027466ff528c2935e05a8f5dc3f.patch"; - sha256 = "sha256-hvm2GcqiMYYxOLpQFXdyz325jZme7W+VYipu5goKoiU="; - }) - (fetchpatch { - url = "https://github.com/elementary/gala/commit/45126e4c2d3736e872c05941a2047a54788cd011.patch"; - sha256 = "sha256-LdhFFFNwvF1p1LqJXer8+DOgAptiHZHlfnQBwVEIZjo="; - }) ]; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix index f342642e326c..2a13ff787c61 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-applications-menu"; - version = "2.11.0"; + version = "2.11.1"; src = fetchFromGitHub { owner = "elementary"; repo = "applications-menu"; rev = version; - sha256 = "sha256-pEBvFN+zYsF8CbB29rTNclwAYhw/Hb0HhLzXtijfI4M="; + sha256 = "sha256-WlRrEkX0DGIHYWvUc9G4BbvofzWJwqkiJaJFwQ43GPE="; }; patches = [ diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix index 1dc4a3a838b5..e6675ae99507 100644 --- a/pkgs/development/libraries/proj/default.nix +++ b/pkgs/development/libraries/proj/default.nix @@ -12,6 +12,7 @@ , gtest , nlohmann_json , python3 +, cacert }: stdenv.mkDerivation (finalAttrs: rec { @@ -40,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: rec { buildInputs = [ sqlite libtiff curl nlohmann_json ]; - nativeCheckInputs = [ gtest ]; + nativeCheckInputs = [ cacert gtest ]; cmakeFlags = [ "-DUSE_EXTERNAL_GTEST=ON" diff --git a/pkgs/development/libraries/span-lite/default.nix b/pkgs/development/libraries/span-lite/default.nix new file mode 100644 index 000000000000..1af8466a4d07 --- /dev/null +++ b/pkgs/development/libraries/span-lite/default.nix @@ -0,0 +1,29 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "span-lite"; + version = "0.10.3"; + + src = fetchFromGitHub { + owner = "martinmoene"; + repo = "span-lite"; + rev = "v${version}"; + hash = "sha256-WfoyyPLBqXSGGATWN/wny6P++3aCmQMOMLCARhB+R3c="; + }; + + nativeBuildInputs = [ + cmake + ]; + + meta = { + description = "A C++20-like span for C++98, C++11 and later in a single-file header-only library"; + homepage = "https://github.com/martinmoene/span-lite"; + license = lib.licenses.bsd1; + maintainers = with lib.maintainers; [ icewind1991 ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/games/openloco/default.nix b/pkgs/games/openloco/default.nix new file mode 100644 index 000000000000..c884c39dafa2 --- /dev/null +++ b/pkgs/games/openloco/default.nix @@ -0,0 +1,57 @@ +{ lib +, stdenv +, fetchFromGitHub +, SDL2 +, cmake +, libpng +, libzip +, openal +, pkg-config +, span-lite +, yaml-cpp +}: + +stdenv.mkDerivation rec { + pname = "openloco"; + version = "23.02"; + + src = fetchFromGitHub { + owner = "OpenLoco"; + repo = "OpenLoco"; + rev = "v${version}"; + hash = "sha256-35g7tnKez4tnTdZzavfU+X8f3btFG6EbLkU+cqL6Qek="; + }; + + # the upstream build process determines the version tag from git; since we + # are not using a git checkout, we patch it manually + postPatch = '' + sed -i '/#define NAME "OpenLoco"/a#define OPENLOCO_VERSION_TAG "${version}"' src/OpenLoco/src/Version.cpp + ''; + + NIX_CFLAGS_COMPILE = "-Wno-error=null-dereference"; + + cmakeFlags = [ + "-DOPENLOCO_BUILD_TESTS=NO" + ]; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + buildInputs = [ + SDL2 + libpng + libzip + openal + yaml-cpp + span-lite + ]; + + meta = { + description = "An open source re-implementation of Chris Sawyer's Locomotion"; + homepage = "https://github.com/OpenLoco/OpenLoco"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ icewind1991 ]; + }; +} diff --git a/pkgs/os-specific/linux/rtl88x2bu/default.nix b/pkgs/os-specific/linux/rtl88x2bu/default.nix index d3560aca91ad..7cd15f194cc0 100644 --- a/pkgs/os-specific/linux/rtl88x2bu/default.nix +++ b/pkgs/os-specific/linux/rtl88x2bu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rtl88x2bu"; - version = "${kernel.version}-unstable-2022-12-17"; + version = "${kernel.version}-unstable-2023-02-24"; src = fetchFromGitHub { owner = "morrownr"; repo = "88x2bu-20210702"; - rev = "9a04d2bb9d882c7f2708560774d7b96a70d83f4b"; - sha256 = "sha256-PxTUCYBfyCDB8IjNKsp7aiPtSI3TFzGuJsHqG66e2Q0="; + rev = "51a2fb94893c562ec5f2fabce0b80e4da4eda812"; + sha256 = "sha256-nTas2EkghZeQhc8bTtoQfHEl8QJtClXi9V1IxlIThbI="; }; hardeningDisable = [ "pic" ]; diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix index 177d2fac3103..47db76b3ca38 100644 --- a/pkgs/servers/mautrix-telegram/default.nix +++ b/pkgs/servers/mautrix-telegram/default.nix @@ -8,27 +8,27 @@ let python = python3.override { packageOverrides = self: super: { tulir-telethon = self.telethon.overridePythonAttrs (oldAttrs: rec { - version = "1.28.0a1"; + version = "1.28.0a3"; pname = "tulir-telethon"; src = super.fetchPypi { inherit pname version; - hash = "sha256-Kf7S5nSvedhA5RYt5rbTxBiQq6DGwHJ5uEYxd9AsYIc="; + hash = "sha256-N1XQGpjfyUqcT+bsSBxC5Purvnd/+4NzVzMhiaq5yDo="; }; doCheck = false; }); }; }; in -python.pkgs.buildPythonPackage { +python.pkgs.buildPythonPackage rec { pname = "mautrix-telegram"; - version = "unstable-2023-02-16"; + version = "0.13.0"; disabled = python.pythonOlder "3.8"; src = fetchFromGitHub { owner = "mautrix"; repo = "telegram"; - rev = "354b49d9e5f91f913b5fdf9288bc631a9a34d142"; - hash = "sha256-zdK/0jgw++YwSzP8qs1BqInQlFOoM63TeI1jF1AqDnk="; + rev = "refs/tags/v${version}"; + hash = "sha256-AfCo2uHOcSNCWXgrCLzJwl0Dj8n9Asdqm19wk0OeXgQ="; }; format = "setuptools"; diff --git a/pkgs/tools/admin/pulumi-packages/default.nix b/pkgs/tools/admin/pulumi-packages/default.nix index c1c76934945f..588214980782 100644 --- a/pkgs/tools/admin/pulumi-packages/default.nix +++ b/pkgs/tools/admin/pulumi-packages/default.nix @@ -6,6 +6,7 @@ in { pulumi-aws-native = callPackage' ./pulumi-aws-native.nix { }; pulumi-azure-native = callPackage' ./pulumi-azure-native.nix { }; + pulumi-command = callPackage' ./pulumi-command.nix { }; pulumi-language-nodejs = callPackage ./pulumi-language-nodejs.nix { }; pulumi-language-python = callPackage ./pulumi-language-python.nix { }; pulumi-random = callPackage' ./pulumi-random.nix { }; diff --git a/pkgs/tools/admin/pulumi-packages/pulumi-command.nix b/pkgs/tools/admin/pulumi-packages/pulumi-command.nix new file mode 100644 index 000000000000..3b181ceb05b0 --- /dev/null +++ b/pkgs/tools/admin/pulumi-packages/pulumi-command.nix @@ -0,0 +1,33 @@ +{ lib +, mkPulumiPackage +}: +mkPulumiPackage rec { + owner = "pulumi"; + repo = "pulumi-command"; + version = "0.7.1"; + rev = "v${version}"; + hash = "sha256-QrKtnpJGWoc5WwV6bnERrN3iBJpyoFKFwlqBtNNK7F8="; + vendorHash = "sha256-HyzWPRYfjdjGGBByCc8N91qWhX2QBJoQMpudHWrkmFM="; + cmdGen = "pulumi-gen-command"; + cmdRes = "pulumi-resource-command"; + extraLdflags = [ + "-X github.com/pulumi/${repo}/provider/v4/pkg/version.Version=v${version}" + ]; + + postConfigure = '' + pushd .. + + ${cmdGen} provider/cmd/pulumi-resource-command/schema.json --version ${version} + + popd + ''; + + __darwinAllowLocalNetworking = true; + + meta = with lib; { + description = "A Pulumi provider to execute commands and scripts either locally or remotely as part of the Pulumi resource model"; + homepage = "https://github.com/pulumi/pulumi-command"; + license = licenses.asl20; + maintainers = with maintainers; [ veehaitch trundle ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bb24e6f4736a..243991f5932c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -512,7 +512,9 @@ with pkgs; efficient-compression-tool = callPackage ../tools/compression/efficient-compression-tool { }; - enumer = callPackage ../tools/misc/enumer { }; + enumer = callPackage ../tools/misc/enumer { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; evans = callPackage ../development/tools/evans { }; @@ -1541,7 +1543,9 @@ with pkgs; mnc = callPackage ../tools/misc/mnc { }; - mgmt = callPackage ../applications/system/mgmt {}; + mgmt = callPackage ../applications/system/mgmt { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; mprocs = callPackage ../tools/misc/mprocs { }; @@ -2402,6 +2406,8 @@ with pkgs; lf = callPackage ../applications/file-managers/lf { }; + ctpv = callPackage ../applications/file-managers/lf/ctpv.nix { }; + llama = callPackage ../applications/file-managers/llama { }; mc = callPackage ../applications/file-managers/mc { @@ -3004,7 +3010,9 @@ with pkgs; botamusique = callPackage ../tools/audio/botamusique { }; - boulder = callPackage ../tools/admin/boulder { }; + boulder = callPackage ../tools/admin/boulder { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; btrfs-heatmap = callPackage ../tools/filesystems/btrfs-heatmap { }; @@ -3454,7 +3462,9 @@ with pkgs; gospider = callPackage ../tools/security/gospider { }; - browserpass = callPackage ../tools/security/browserpass { }; + browserpass = callPackage ../tools/security/browserpass { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; passff-host = callPackage ../tools/security/passff-host { }; @@ -4071,7 +4081,9 @@ with pkgs; cloudbrute = callPackage ../tools/security/cloudbrute { }; - cloudflared = callPackage ../applications/networking/cloudflared { }; + cloudflared = callPackage ../applications/networking/cloudflared { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; cloudflare-dyndns = callPackage ../applications/networking/cloudflare-dyndns { }; @@ -4908,7 +4920,9 @@ with pkgs; gscan2pdf = callPackage ../applications/graphics/gscan2pdf { }; - gsctl = callPackage ../applications/misc/gsctl { }; + gsctl = callPackage ../applications/misc/gsctl { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; gsocket = callPackage ../tools/networking/gsocket { }; @@ -5403,7 +5417,9 @@ with pkgs; pcb2gcode = callPackage ../tools/misc/pcb2gcode { }; - pcp = callPackage ../tools/misc/pcp { }; + pcp = callPackage ../tools/misc/pcp { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; persepolis = python3Packages.callPackage ../tools/networking/persepolis { wrapQtAppsHook = qt5.wrapQtAppsHook; @@ -6090,7 +6106,9 @@ with pkgs; unionfs-fuse = callPackage ../tools/filesystems/unionfs-fuse { }; - unparam = callPackage ../tools/misc/unparam { }; + unparam = callPackage ../tools/misc/unparam { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; inherit (nodePackages) uppy-companion; @@ -6566,7 +6584,9 @@ with pkgs; dnspeep = callPackage ../tools/security/dnspeep { }; - dnsproxy = callPackage ../tools/networking/dnsproxy { }; + dnsproxy = callPackage ../tools/networking/dnsproxy { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; dnsperf = callPackage ../tools/networking/dnsperf { }; @@ -7093,7 +7113,9 @@ with pkgs; endlessh-go = callPackage ../servers/endlessh-go { }; - eris-go = callPackage ../servers/eris-go { }; + eris-go = callPackage ../servers/eris-go { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; ericw-tools = callPackage ../applications/misc/ericw-tools { stdenv = gcc10StdenvCompat; }; @@ -7891,7 +7913,9 @@ with pkgs; goreplay = callPackage ../tools/networking/goreplay { }; - gost = callPackage ../tools/networking/gost { }; + gost = callPackage ../tools/networking/gost { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; gource = callPackage ../applications/version-management/gource { }; @@ -8541,7 +8565,9 @@ with pkgs; ipfetch = callPackage ../tools/networking/ipfetch { }; - ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { }; + ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; ipfs-upload-client = callPackage ../applications/networking/ipfs-upload-client { }; @@ -8901,7 +8927,9 @@ with pkgs; kdiff3 = libsForQt5.callPackage ../tools/text/kdiff3 { }; - kube-router = callPackage ../applications/networking/cluster/kube-router { }; + kube-router = callPackage ../applications/networking/cluster/kube-router { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; kubepug = callPackage ../development/tools/kubepug { }; @@ -8909,7 +8937,9 @@ with pkgs; kubergrunt = callPackage ../applications/networking/cluster/kubergrunt { }; - kubo = callPackage ../applications/networking/kubo { }; + kubo = callPackage ../applications/networking/kubo { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; kubo-migrator-all-fs-repo-migrations = callPackage ../applications/networking/kubo-migrator/all-migrations.nix { }; kubo-migrator-unwrapped = callPackage ../applications/networking/kubo-migrator/unwrapped.nix { }; @@ -10472,7 +10502,9 @@ with pkgs; onlykey = callPackage ../tools/security/onlykey { node_webkit = nwjs; }; - ooniprobe-cli = callPackage ../tools/networking/ooniprobe-cli { }; + ooniprobe-cli = callPackage ../tools/networking/ooniprobe-cli { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; openapi-generator-cli = callPackage ../tools/networking/openapi-generator-cli { jre = pkgs.jre_headless; }; openapi-generator-cli-unstable = callPackage ../tools/networking/openapi-generator-cli/unstable.nix { jre = pkgs.jre_headless; }; @@ -16164,6 +16196,9 @@ with pkgs; llvmPackages = llvmPackages_14; avrgcc = pkgsCross.avr.buildPackages.gcc; wasi-libc = pkgsCross.wasi32.wasilibc; + # go 1.20 build failure + go = go_1_19; + buildGoModule = buildGo119Module; }; tinyscheme = callPackage ../development/interpreters/tinyscheme { }; @@ -17828,7 +17863,9 @@ with pkgs; emma = callPackage ../development/tools/analysis/emma { }; - ent-go = callPackage ../development/tools/ent { }; + ent-go = callPackage ../development/tools/ent { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; epm = callPackage ../development/tools/misc/epm { }; @@ -22161,7 +22198,9 @@ with pkgs; lightstep-tracer-cpp = callPackage ../development/libraries/lightstep-tracer-cpp { }; - ligolo-ng = callPackage ../tools/networking/ligolo-ng { }; + ligolo-ng = callPackage ../tools/networking/ligolo-ng { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; linenoise = callPackage ../development/libraries/linenoise { }; @@ -23430,6 +23469,8 @@ with pkgs; soundtouch = callPackage ../development/libraries/soundtouch {}; + span-lite = callPackage ../development/libraries/span-lite { }; + spandsp = callPackage ../development/libraries/spandsp {}; spandsp3 = callPackage ../development/libraries/spandsp/3.nix {}; @@ -24602,9 +24643,13 @@ with pkgs; grafana = callPackage ../servers/monitoring/grafana { }; grafanaPlugins = callPackages ../servers/monitoring/grafana/plugins { }; - grafana-agent = callPackage ../servers/monitoring/grafana-agent {}; + grafana-agent = callPackage ../servers/monitoring/grafana-agent { + buildGoModule = buildGo119Module; # nixosTests.grafana-agent go 1.20 failure + }; - grafana-loki = callPackage ../servers/monitoring/loki { }; + grafana-loki = callPackage ../servers/monitoring/loki { + buildGoModule = buildGo119Module; # nixosTests.loki go 1.20 failure + }; promtail = callPackage ../servers/monitoring/loki/promtail.nix { }; mimir = callPackage ../servers/monitoring/mimir { }; @@ -24854,7 +24899,9 @@ with pkgs; networkaudiod = callPackage ../servers/networkaudiod { }; - unifiedpush-common-proxies = callPackage ../servers/unifiedpush-common-proxies { }; + unifiedpush-common-proxies = callPackage ../servers/unifiedpush-common-proxies { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; unit = callPackage ../servers/http/unit { }; @@ -25544,7 +25591,9 @@ with pkgs; vouch-proxy = callPackage ../servers/vouch-proxy { }; - victoriametrics = callPackage ../servers/nosql/victoriametrics { }; + victoriametrics = callPackage ../servers/nosql/victoriametrics { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; virtiofsd = callPackage ../servers/misc/virtiofsd { }; @@ -25950,7 +25999,9 @@ with pkgs; gomp = callPackage ../applications/version-management/gomp { }; - gomplate = callPackage ../development/tools/gomplate { }; + gomplate = callPackage ../development/tools/gomplate { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; gpm = callPackage ../servers/gpm { withNcurses = false; # Keep curses disabled for lack of value @@ -29186,7 +29237,9 @@ with pkgs; edlin = callPackage ../applications/editors/edlin { }; - o = callPackage ../applications/editors/o { }; + o = callPackage ../applications/editors/o { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; oed = callPackage ../applications/editors/oed { }; @@ -30320,7 +30373,9 @@ with pkgs; hyperion-ng = libsForQt5.callPackage ../applications/video/hyperion-ng { }; - hyperledger-fabric = callPackage ../tools/misc/hyperledger-fabric { }; + hyperledger-fabric = callPackage ../tools/misc/hyperledger-fabric { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; hypnotix = callPackage ../applications/video/hypnotix { }; @@ -31804,7 +31859,9 @@ with pkgs; opcr-policy = callPackage ../development/tools/opcr-policy { }; - open-policy-agent = callPackage ../development/tools/open-policy-agent { }; + open-policy-agent = callPackage ../development/tools/open-policy-agent { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; openmm = callPackage ../development/libraries/science/chemistry/openmm { stdenv = gcc11Stdenv; @@ -32532,7 +32589,9 @@ with pkgs; properties-cpp = callPackage ../development/libraries/properties-cpp { }; - protonmail-bridge = callPackage ../applications/networking/protonmail-bridge { }; + protonmail-bridge = callPackage ../applications/networking/protonmail-bridge { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; protonvpn-cli = python3Packages.callPackage ../applications/networking/protonvpn-cli { }; protonvpn-cli_2 = python3Packages.callPackage ../applications/networking/protonvpn-cli/2.nix { }; @@ -33307,7 +33366,9 @@ with pkgs; syncterm = callPackage ../applications/terminal-emulators/syncterm { }; - inherit (callPackages ../applications/networking/syncthing { }) + inherit (callPackages ../applications/networking/syncthing { + buildGoModule = buildGo119Module; # go 1.20 build failure + }) syncthing syncthing-discovery syncthing-relay; @@ -33591,7 +33652,9 @@ with pkgs; toxic = callPackage ../applications/networking/instant-messengers/toxic { }; - toxiproxy = callPackage ../development/tools/toxiproxy { }; + toxiproxy = callPackage ../development/tools/toxiproxy { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; tqsl = callPackage ../applications/radio/tqsl { openssl = openssl_1_1; @@ -34704,7 +34767,9 @@ with pkgs; ergo = callPackage ../applications/blockchains/ergo { }; - erigon = callPackage ../applications/blockchains/erigon { }; + erigon = callPackage ../applications/blockchains/erigon { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; exodus = callPackage ../applications/blockchains/exodus { }; @@ -35617,6 +35682,8 @@ with pkgs; openjk = callPackage ../games/openjk { }; + openloco = pkgsi686Linux.callPackage ../games/openloco { }; + openmw = libsForQt5.callPackage ../games/openmw { }; openmw-tes3mp = libsForQt5.callPackage ../games/openmw/tes3mp.nix { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a9907ecc3c8b..2b80a3aa8201 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1131,6 +1131,8 @@ self: super: with self; { pulumi-azure-native = pkgs.pulumiPackages.pulumi-azure-native.sdks.python; + pulumi-command = pkgs.pulumiPackages.pulumi-command.sdks.python; + pulumi-random = pkgs.pulumiPackages.pulumi-random.sdks.python; backcall = callPackage ../development/python-modules/backcall { }; |