diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index d304498ec593..f88125e56ccc 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -753,6 +753,7 @@ with lib.maintainers; members = [ SuperSandro2000 anthonyroussel + vinetos ]; scope = "Maintain the ecosystem around OpenStack"; shortName = "OpenStack"; diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 52a8fdf0c974..22c461700ea2 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -119,6 +119,8 @@ - `grafana` has been updated to version 11.1. This version doesn't support setting `http_addr` to a hostname anymore, an IP address is expected. +- `services.kubernetes.kubelet.clusterDns` now accepts a list of DNS resolvers rather than a single string, bringing the module more in line with the upstream Kubelet configuration schema. + - `wstunnel` has had a major version upgrade that entailed rewriting the program in Rust. The module was updated to accommodate for breaking changes. Breaking changes to the module API were minimised as much as possible, @@ -173,6 +175,8 @@ - All Cinnamon and XApp packages have been moved to top-level (i.e., `cinnamon.nemo` is now `nemo`). +- All GNOME packages have been moved to top-level (i.e., `gnome.nautilus` is now `nautilus`). + - `services.cgit` now runs as the cgit user by default instead of root. This change requires granting access to the repositories to this user or setting the appropriate one through `services.cgit.some-instance.user`. diff --git a/nixos/modules/config/xdg/portal.nix b/nixos/modules/config/xdg/portal.nix index ec4e13169fa3..7e66a32c7db2 100644 --- a/nixos/modules/config/xdg/portal.nix +++ b/nixos/modules/config/xdg/portal.nix @@ -83,7 +83,7 @@ in configPackages = mkOption { type = types.listOf types.package; default = [ ]; - example = lib.literalExpression "[ pkgs.gnome.gnome-session ]"; + example = lib.literalExpression "[ pkgs.gnome-session ]"; description = '' List of packages that provide XDG desktop portal configuration, usually in the form of `share/xdg-desktop-portal/$desktop-portals.conf`. diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix index 1de5ba113875..81d59f55db7c 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix @@ -25,7 +25,7 @@ sleep-inactive-battery-type='nothing' ''; - extraGSettingsOverridePackages = [ pkgs.gnome.gnome-settings-daemon ]; + extraGSettingsOverridePackages = [ pkgs.gnome-settings-daemon ]; enable = true; }; diff --git a/nixos/modules/services/cluster/kubernetes/kubelet.nix b/nixos/modules/services/cluster/kubernetes/kubelet.nix index fd9df556e7ec..cdbda5fc62f9 100644 --- a/nixos/modules/services/cluster/kubernetes/kubelet.nix +++ b/nixos/modules/services/cluster/kubernetes/kubelet.nix @@ -64,7 +64,7 @@ let } // lib.optionalAttrs (cfg.tlsCertFile != null) { tlsCertFile = cfg.tlsCertFile; } // lib.optionalAttrs (cfg.tlsKeyFile != null) { tlsPrivateKeyFile = cfg.tlsKeyFile; } // lib.optionalAttrs (cfg.clusterDomain != "") { clusterDomain = cfg.clusterDomain; } - // lib.optionalAttrs (cfg.clusterDns != "") { clusterDNS = [ cfg.clusterDns ] ; } + // lib.optionalAttrs (cfg.clusterDns != []) { clusterDNS = cfg.clusterDns; } // lib.optionalAttrs (cfg.featureGates != {}) { featureGates = cfg.featureGates; } )); @@ -112,8 +112,8 @@ in clusterDns = mkOption { description = "Use alternative DNS."; - default = "10.1.0.1"; - type = str; + default = [ "10.1.0.1" ]; + type = listOf str; }; clusterDomain = mkOption { diff --git a/nixos/modules/services/desktops/gnome/gnome-settings-daemon.nix b/nixos/modules/services/desktops/gnome/gnome-settings-daemon.nix index 30b35f669092..21e7c3b58713 100644 --- a/nixos/modules/services/desktops/gnome/gnome-settings-daemon.nix +++ b/nixos/modules/services/desktops/gnome/gnome-settings-daemon.nix @@ -32,15 +32,15 @@ in config = lib.mkIf cfg.enable { environment.systemPackages = [ - pkgs.gnome.gnome-settings-daemon + pkgs.gnome-settings-daemon ]; services.udev.packages = [ - pkgs.gnome.gnome-settings-daemon + pkgs.gnome-settings-daemon ]; systemd.packages = [ - pkgs.gnome.gnome-settings-daemon + pkgs.gnome-settings-daemon ]; systemd.user.targets."gnome-session-x11-services".wants = [ diff --git a/nixos/modules/services/x11/desktop-managers/gnome.md b/nixos/modules/services/x11/desktop-managers/gnome.md index 9943f138dc60..6641bc9ff43b 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.md +++ b/nixos/modules/services/x11/desktop-managers/gnome.md @@ -167,7 +167,7 @@ You can use `dconf-editor` tool to explore which GSettings you can set. extraGSettingsOverridePackages = [ pkgs.gsettings-desktop-schemas # for org.gnome.desktop - pkgs.gnome.gnome-shell # for org.gnome.shell + pkgs.gnome-shell # for org.gnome.shell ]; }; } diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index 678ba1b12307..e07700469dfb 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -108,7 +108,7 @@ in favorite-apps=[ 'firefox.desktop', 'org.gnome.Calendar.desktop' ] ''' ''; - description = "List of desktop files to put as favorite apps into gnome-shell. These need to be installed somehow globally."; + description = "List of desktop files to put as favorite apps into pkgs.gnome-shell. These need to be installed somehow globally."; }; extraGSettingsOverrides = mkOption { @@ -123,7 +123,7 @@ in description = "List of packages for which gsettings are overridden."; }; - debug = mkEnableOption "gnome-session debug messages"; + debug = mkEnableOption "pkgs.gnome-session debug messages"; flashback = { enableMetacity = mkEnableOption "the standard GNOME Flashback session with Metacity"; @@ -162,11 +162,11 @@ in }; panelModulePackages = mkOption { - default = [ pkgs.gnome.gnome-applets ]; - defaultText = literalExpression "[ pkgs.gnome.gnome-applets ]"; + default = [ pkgs.gnome-applets ]; + defaultText = literalExpression "[ pkgs.gnome-applets ]"; type = types.listOf types.package; description = '' - Packages containing modules that should be made available to `gnome-panel` (usually for applets). + Packages containing modules that should be made available to `pkgs.gnome-panel` (usually for applets). If you're packaging something to use here, please install the modules in `$out/lib/gnome-panel/modules`. ''; @@ -196,7 +196,7 @@ in services.gnome.core-shell.enable = true; services.gnome.core-utilities.enable = mkDefault true; - services.displayManager.sessionPackages = [ pkgs.gnome.gnome-session.sessions ]; + services.displayManager.sessionPackages = [ pkgs.gnome-session.sessions ]; environment.extraInit = '' ${lib.concatMapStrings (p: '' @@ -228,7 +228,7 @@ in assert (lib.assertMsg namesAreUnique "Flashback WM names must be unique."); map (wm: - pkgs.gnome.gnome-flashback.mkSessionForWm { + pkgs.gnome-flashback.mkSessionForWm { inherit (wm) wmName wmLabel wmCommand; } ) flashbackWms; @@ -237,20 +237,20 @@ in enableGnomeKeyring = true; }; - systemd.packages = with pkgs.gnome; [ - gnome-flashback - ] ++ map gnome-flashback.mkSystemdTargetForWm flashbackWms; + systemd.packages = [ + pkgs.gnome-flashback + ] ++ map pkgs.gnome-flashback.mkSystemdTargetForWm flashbackWms; - environment.systemPackages = with pkgs.gnome; [ - gnome-flashback - (gnome-panel-with-modules.override { + environment.systemPackages = [ + pkgs.gnome-flashback + (pkgs.gnome-panel-with-modules.override { panelModulePackages = cfg.flashback.panelModulePackages; }) ] # For /share/applications/${wmName}.desktop - ++ (map (wm: gnome-flashback.mkWmApplication { inherit (wm) wmName wmLabel wmCommand; }) flashbackWms) - # For /share/gnome-session/sessions/gnome-flashback-${wmName}.session - ++ (map (wm: gnome-flashback.mkGnomeSession { inherit (wm) wmName wmLabel enableGnomePanel; }) flashbackWms); + ++ (map (wm: pkgs.gnome-flashback.mkWmApplication { inherit (wm) wmName wmLabel wmCommand; }) flashbackWms) + # For /share/pkgs.gnome-session/sessions/gnome-flashback-${wmName}.session + ++ (map (wm: pkgs.gnome-flashback.mkGnomeSession { inherit (wm) wmName wmLabel enableGnomePanel; }) flashbackWms); }) (lib.mkIf serviceCfg.core-os-services.enable { @@ -287,7 +287,7 @@ in buildPortalsInGnome = false; }) ]; - xdg.portal.configPackages = mkDefault [ pkgs.gnome.gnome-session ]; + xdg.portal.configPackages = mkDefault [ pkgs.gnome-session ]; networking.networkmanager.enable = mkDefault true; @@ -309,7 +309,7 @@ in services.xserver.desktopManager.gnome.sessionPath = let mandatoryPackages = [ - pkgs.gnome.gnome-shell + pkgs.gnome-shell ]; optionalPackages = [ pkgs.gnome-shell-extensions @@ -329,15 +329,15 @@ in services.gvfs.enable = true; services.system-config-printer.enable = (lib.mkIf config.services.printing.enable (mkDefault true)); - systemd.packages = with pkgs.gnome; [ - gnome-session - gnome-shell + systemd.packages = [ + pkgs.gnome-session + pkgs.gnome-shell ]; - services.udev.packages = with pkgs.gnome; [ + services.udev.packages = [ # Force enable KMS modifiers for devices that require them. - # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1443 - mutter + # https://gitlab.gnome.org/GNOME/pkgs.mutter/-/merge_requests/1443 + pkgs.mutter ]; services.avahi.enable = mkDefault true; @@ -368,16 +368,16 @@ in # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-38/elements/core/meta-gnome-core-shell.bst environment.systemPackages = let - mandatoryPackages = with pkgs.gnome; [ - gnome-shell + mandatoryPackages = [ + pkgs.gnome-shell ]; - optionalPackages = with pkgs.gnome; [ + optionalPackages = [ pkgs.adwaita-icon-theme nixos-background-info pkgs.gnome-backgrounds - gnome-bluetooth + pkgs.gnome-bluetooth pkgs.gnome-color-manager - gnome-control-center + pkgs.gnome-control-center pkgs.gnome-shell-extensions pkgs.gnome-tour # GNOME Shell detects the .desktop file on first log-in. pkgs.gnome-user-docs diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index a401af9b7e18..55d5c2cb292d 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -177,7 +177,7 @@ in pkgs.pantheon.mutter ]; systemd.packages = with pkgs; [ - gnome.gnome-session + gnome-session pantheon.gala pantheon.gnome-settings-daemon pantheon.elementary-session-settings diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index c4987f1b6322..c454b110776b 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -153,7 +153,7 @@ in XDG_DATA_DIRS = lib.makeSearchPath "share" [ gdm # for gnome-login.session config.services.displayManager.sessionData.desktops - pkgs.gnome.gnome-control-center # for accessibility icon + pkgs.gnome-control-center # for accessibility icon pkgs.adwaita-icon-theme pkgs.hicolor-icon-theme # empty icon theme as a base ]; @@ -181,7 +181,11 @@ in ]; # Otherwise GDM will not be able to start correctly and display Wayland sessions - systemd.packages = with pkgs.gnome; [ gdm gnome-session gnome-shell ]; + systemd.packages = with pkgs.gnome; [ + gdm + pkgs.gnome-session + pkgs.gnome-shell + ]; environment.systemPackages = [ pkgs.adwaita-icon-theme ]; # We dont use the upstream gdm service @@ -232,7 +236,7 @@ in EnvironmentFile = "-/etc/locale.conf"; }; - systemd.services.display-manager.path = [ pkgs.gnome.gnome-session ]; + systemd.services.display-manager.path = [ pkgs.gnome-session ]; # Allow choosing an user account services.accounts-daemon.enable = true; diff --git a/nixos/tests/gnome-extensions.nix b/nixos/tests/gnome-extensions.nix index 332cf44b0ed4..109fdf6b0846 100644 --- a/nixos/tests/gnome-extensions.nix +++ b/nixos/tests/gnome-extensions.nix @@ -45,7 +45,7 @@ import ./make-test-python.nix ( # Eval API is now internal so Shell needs to run in unsafe mode. # TODO: improve test driver so that it supports openqa-like manipulation # that would allow us to drop this mess. - "${pkgs.gnome.gnome-shell}/bin/gnome-shell --unsafe-mode" + "${pkgs.gnome-shell}/bin/gnome-shell --unsafe-mode" ]; }; }; diff --git a/nixos/tests/gnome-xorg.nix b/nixos/tests/gnome-xorg.nix index c8ffb459edec..45538ef4eab4 100644 --- a/nixos/tests/gnome-xorg.nix +++ b/nixos/tests/gnome-xorg.nix @@ -35,7 +35,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { # Eval API is now internal so Shell needs to run in unsafe mode. # TODO: improve test driver so that it supports openqa-like manipulation # that would allow us to drop this mess. - "${pkgs.gnome.gnome-shell}/bin/gnome-shell --unsafe-mode" + "${pkgs.gnome-shell}/bin/gnome-shell --unsafe-mode" ]; }; }; diff --git a/nixos/tests/gnome.nix b/nixos/tests/gnome.nix index 98d61c7ea172..9a296b93682c 100644 --- a/nixos/tests/gnome.nix +++ b/nixos/tests/gnome.nix @@ -31,7 +31,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { # Eval API is now internal so Shell needs to run in unsafe mode. # TODO: improve test driver so that it supports openqa-like manipulation # that would allow us to drop this mess. - "${pkgs.gnome.gnome-shell}/bin/gnome-shell --unsafe-mode" + "${pkgs.gnome-shell}/bin/gnome-shell --unsafe-mode" ]; }; }; diff --git a/nixos/tests/matrix/mjolnir.nix b/nixos/tests/matrix/mjolnir.nix index 8a888b17a3d7..265b13821ebd 100644 --- a/nixos/tests/matrix/mjolnir.nix +++ b/nixos/tests/matrix/mjolnir.nix @@ -109,8 +109,8 @@ import ../make-test-python.nix ( environment.systemPackages = [ (pkgs.writers.writePython3Bin "create_management_room_and_invite_mjolnir" { libraries = with pkgs.python3Packages; [ - matrix-nio - ] ++ matrix-nio.optional-dependencies.e2e; + (matrix-nio.override { withOlm = true; }) + ]; } '' import asyncio diff --git a/nixos/tests/systemd-initrd-luks-fido2.nix b/nixos/tests/systemd-initrd-luks-fido2.nix index 207f51f4dd9b..4441ad061ee4 100644 --- a/nixos/tests/systemd-initrd-luks-fido2.nix +++ b/nixos/tests/systemd-initrd-luks-fido2.nix @@ -9,7 +9,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { # Booting off the encrypted disk requires having a Nix store available for the init script mountHostNixStore = true; useEFIBoot = true; - qemu.options = [ "-device canokey,file=/tmp/canokey-file" ]; + qemu.options = [ "-device pci-ohci,id=usb-bus" "-device canokey,bus=usb-bus.0,file=/tmp/canokey-file" ]; }; boot.loader.systemd-boot.enable = true; diff --git a/pkgs/applications/audio/tidal-hifi/default.nix b/pkgs/applications/audio/tidal-hifi/default.nix index c76c6c6a4f86..1a5b41808a75 100644 --- a/pkgs/applications/audio/tidal-hifi/default.nix +++ b/pkgs/applications/audio/tidal-hifi/default.nix @@ -4,6 +4,7 @@ , autoPatchelfHook , dpkg , makeWrapper +, wrapGAppsHook3 , alsa-lib , at-spi2-atk , at-spi2-core @@ -37,14 +38,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "tidal-hifi"; - version = "5.15.0"; + version = "5.16.0"; src = fetchurl { url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${finalAttrs.version}/tidal-hifi_${finalAttrs.version}_amd64.deb"; - sha256 = "sha256-0OXNynf56On+emLO0ZfNIcoT3GEhSXdoQhfxapLYYic="; + sha256 = "sha256-gDinm7kILm4SKlWmaJ1grwRuketGs/aWlJfNEF+AIRo="; }; - nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ]; + nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper wrapGAppsHook3 ]; buildInputs = [ alsa-lib diff --git a/pkgs/applications/editors/molsketch/default.nix b/pkgs/applications/editors/molsketch/default.nix index abbedff17c16..dd3ee9bcdbb1 100644 --- a/pkgs/applications/editors/molsketch/default.nix +++ b/pkgs/applications/editors/molsketch/default.nix @@ -33,9 +33,9 @@ stdenv.mkDerivation rec { --replace "CXX_STANDARD 14" "CXX_STANDARD 17" ''; - preConfigure = '' - cmakeFlags="$cmakeFlags -DMSK_PREFIX=$out" - ''; + cmakeFlags = [ + "-DMSK_PREFIX=${placeholder "out"}" + ]; postFixup = '' ln -s $out/lib/molsketch/* $out/lib/. diff --git a/pkgs/applications/graphics/pymeshlab/default.nix b/pkgs/applications/graphics/pymeshlab/default.nix index 255b14f09211..4a4653b45227 100644 --- a/pkgs/applications/graphics/pymeshlab/default.nix +++ b/pkgs/applications/graphics/pymeshlab/default.nix @@ -88,12 +88,10 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace src/meshlab/src/external/ssynth.cmake \ --replace-fail '$'{SSYNTH_LINK} ${structuresynth.src} \ --replace-warn "MD5 ''${SSYNTH_MD5}" "" - export cmakeFlags="cmakeFlags - -DCMAKE_INSTALL_PREFIX=$out/${python3Packages.python.sitePackages}/pymeshlab - " ''; cmakeFlags = [ + "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/${python3Packages.python.sitePackages}/pymeshlab" "-DVCGDIR=${vcg.src}" ]; diff --git a/pkgs/applications/misc/p2pool/default.nix b/pkgs/applications/misc/p2pool/default.nix index 1ab2edea7662..3d537afc1d2b 100644 --- a/pkgs/applications/misc/p2pool/default.nix +++ b/pkgs/applications/misc/p2pool/default.nix @@ -19,13 +19,13 @@ let in stdenv.mkDerivation rec { pname = "p2pool"; - version = "4.0"; + version = "4.1"; src = fetchFromGitHub { owner = "SChernykh"; repo = "p2pool"; rev = "v${version}"; - hash = "sha256-UAKEyJFdgwJ4Jz3lTG6vmxEkIVLSikWOEBjYV6o72nQ="; + hash = "sha256-eMg8DXFtVfYhl6vpg/KRUZUgMU/XsCS29Af1CSIbUsY="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/phoc/default.nix b/pkgs/applications/misc/phoc/default.nix index 2c31efe54291..494d287364c2 100644 --- a/pkgs/applications/misc/phoc/default.nix +++ b/pkgs/applications/misc/phoc/default.nix @@ -10,7 +10,7 @@ , wrapGAppsHook3 , libinput , gobject-introspection -, gnome +, mutter , gnome-desktop , glib , gtk3 @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { gtk3 gnome-desktop # For keybindings settings schemas - gnome.mutter + mutter json-glib wayland finalAttrs.wlroots diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index 4546883b2bb3..f74e3492f1a8 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, fetchFromGitLab , autoconf, automake, gettext, intltool -, libtool, pkg-config, wrapGAppsHook3, wrapPython, gobject-introspection +, libtool, pkg-config, wrapGAppsHook3, wrapPython, gobject-introspection, wayland-scanner , gtk3, python, pygobject3, pyxdg , withQuartz ? stdenv.isDarwin, ApplicationServices @@ -26,6 +26,8 @@ let strictDeps = true; + depsBuildBuild = [ pkg-config ]; + nativeBuildInputs = [ autoconf automake @@ -37,7 +39,7 @@ let wrapPython gobject-introspection python - ]; + ] ++ lib.optionals (pname == "gammastep") [ wayland-scanner ]; configureFlags = [ "--enable-randr=${if withRandr then "yes" else "no"}" diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix index 69c3fdbfbca0..1c82fa7d8612 100644 --- a/pkgs/applications/networking/browsers/eolie/default.nix +++ b/pkgs/applications/networking/browsers/eolie/default.nix @@ -1,7 +1,7 @@ { lib, fetchgit, meson, ninja, pkg-config, nix-update-script , python3, gtk3, libsecret, gst_all_1, webkitgtk, glib , glib-networking, gtkspell3, hunspell, desktop-file-utils -, gobject-introspection, wrapGAppsHook3, gnome }: +, gobject-introspection, wrapGAppsHook3, gnome-settings-daemon }: python3.pkgs.buildPythonApplication rec { pname = "eolie"; @@ -32,7 +32,7 @@ python3.pkgs.buildPythonApplication rec { gst-plugins-base gst-plugins-ugly gstreamer - gnome.gnome-settings-daemon + gnome-settings-daemon gtk3 gtkspell3 hunspell diff --git a/pkgs/applications/networking/cluster/zarf/default.nix b/pkgs/applications/networking/cluster/zarf/default.nix index 7a802dd351bf..84465bb3d433 100644 --- a/pkgs/applications/networking/cluster/zarf/default.nix +++ b/pkgs/applications/networking/cluster/zarf/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "zarf"; - version = "0.37.0"; + version = "0.38.3"; src = fetchFromGitHub { owner = "defenseunicorns"; repo = "zarf"; rev = "v${version}"; - hash = "sha256-GgvpBYFPH1corqNCA6NQCg6Rkbdez9mFwv5HlmOCKvE="; + hash = "sha256-tnxLktz8tc8ceWirThPR5eqlk5W3jnliiKka6feeX38="; }; - vendorHash = "sha256-gLnUvNxuxrMu6i+b0jgindgcbGOA+tk4N5N4owGV7B8="; + vendorHash = "sha256-y4A3A6zTgZaFjy6B31BAIpyRDp+pYdc/dkFpZq2NQ2c="; proxyVendor = true; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 67cc95799d13..a891660ab95e 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -4,13 +4,13 @@ let if stdenv.isLinux then { stable = "0.0.66"; ptb = "0.0.101"; - canary = "0.0.475"; - development = "0.0.24"; + canary = "0.0.479"; + development = "0.0.25"; } else { - stable = "0.0.316"; - ptb = "0.0.130"; - canary = "0.0.583"; - development = "0.0.46"; + stable = "0.0.317"; + ptb = "0.0.131"; + canary = "0.0.587"; + development = "0.0.47"; }; version = versions.${branch}; srcs = rec { @@ -25,29 +25,29 @@ let }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - hash = "sha256-suVIDCZhI6DwUVizBmTm104Clr6pH/olAIbOMNzFNss="; + hash = "sha256-mirioiRpwQB07sL1avGYk2+Cnmdw7PW808AAA6p2Y0U="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; - hash = "sha256-rSlGL2BwtUxLJltSD2Ms94qmZ4kuX5i9jFqyYC30jyQ="; + hash = "sha256-9dwZ89YOs2iNOeoVrGfNHwr4mvfXmPk1SrJYoteYakY="; }; }; x86_64-darwin = { stable = fetchurl { url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg"; - hash = "sha256-ZJ2ybvKGGCm8CZhwGxmLXZWNUD1eAyg17zD/sBwViB4="; + hash = "sha256-SX6a2qPSFURL00dMLrHSI4+964Xc76ada4PUMlG1V9U="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; - hash = "sha256-mLfeMx5dQNpoLUyoOSCj8XtNxWjsBpVWdFv1obtHJak="; + hash = "sha256-/wuYPjGh/RJZSDeo8r78YEbCYj+qZWTaIDIfKuSH+r0="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; - hash = "sha256-eIjkXOW07sR26iBttT0mGDxNnpLFKlVJtzSAtFcicBg="; + hash = "sha256-6m6wmGzVOEY2oVAHsSMsAtgQK5zqC0D7U3s28pcH0ss="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; - hash = "sha256-nMihtf/xLIxwqAVrF1BSRewdS2WThx0LZ5HZUI+OzM0="; + hash = "sha256-mgVCuTE2zYFRUW6Ukw7mUmPnOR4g/QUFYlWI3bux0es="; }; }; aarch64-darwin = x86_64-darwin; diff --git a/pkgs/applications/networking/instant-messengers/feishu/default.nix b/pkgs/applications/networking/instant-messengers/feishu/default.nix index 0a27f5b81b9c..8a0dc4256a03 100644 --- a/pkgs/applications/networking/instant-messengers/feishu/default.nix +++ b/pkgs/applications/networking/instant-messengers/feishu/default.nix @@ -65,12 +65,12 @@ let sources = { x86_64-linux = fetchurl { - url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/88a232d5/Feishu-linux_x64-7.18.11.deb"; - sha256 = "sha256-EneDVW8eQ6J+M49hn9xLtvlqiDOx4Rs8VMLt1cqSbak="; + url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/bfdb886c/Feishu-linux_x64-7.22.9.deb"; + sha256 = "sha256-4lLCQeW6ZRzmzrHPQ91RxKEqJCxqqa4iGuJ8snZqvkQ="; }; aarch64-linux = fetchurl { - url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/f29ac73d/Feishu-linux_arm64-7.18.11.deb"; - sha256 = "sha256-ghAWPQgVEBSom7zBHUKb56O3EZR4rOnQlz9BRSJBNp4="; + url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/c3f495d6/Feishu-linux_arm64-7.22.9.deb"; + sha256 = "sha256-cT9n1p220ya1T21fWy4b7b7dIx3hqw7lConGaSZ2+UA="; }; }; @@ -131,7 +131,7 @@ let ]; in stdenv.mkDerivation { - version = "7.18.11"; + version = "7.22.9"; pname = "feishu"; src = sources.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix b/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix index 6d39ab785cfa..856aa55f132d 100644 --- a/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix +++ b/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix @@ -41,7 +41,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ cacert setuptools - matrix-nio + (matrix-nio.override { withOlm = true; }) python-magic markdown pillow @@ -51,7 +51,7 @@ buildPythonApplication rec { pyxdg python-olm emoji - ] ++ matrix-nio.optional-dependencies.e2e; + ]; meta = with lib; { description = "Simple but convenient CLI-based Matrix client app for sending and receiving"; diff --git a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix index f5118bb96863..2f22a6e23a47 100644 --- a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix +++ b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix @@ -39,11 +39,10 @@ python3Packages.buildPythonApplication rec { janus keyring logbook - matrix-nio + (matrix-nio.override { withOlm = true; }) peewee prompt-toolkit ] - ++ matrix-nio.optional-dependencies.e2e ++ lib.optionals enableDbusUi optional-dependencies.ui; optional-dependencies.ui = with python3Packages; [ diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix index a67903c6fe98..265065a445e3 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix @@ -56,10 +56,10 @@ in buildPythonPackage { attrs logbook pygments - matrix-nio + (matrix-nio.override { withOlm = true; }) aiohttp requests - ] ++ matrix-nio.optional-dependencies.e2e; + ]; passthru.scripts = [ "matrix.py" ]; diff --git a/pkgs/applications/networking/opsdroid/default.nix b/pkgs/applications/networking/opsdroid/default.nix index 7169850327be..3ef92e059e05 100644 --- a/pkgs/applications/networking/opsdroid/default.nix +++ b/pkgs/applications/networking/opsdroid/default.nix @@ -18,48 +18,45 @@ python3Packages.buildPythonPackage rec { build-system = with python3Packages; [ setuptools ]; - dependencies = - with python3Packages; - [ - aiohttp - aiohttp-middlewares - aioredis - aiosqlite - appdirs - arrow - babel - bitstring - bleach - # botbuilder-core, connector for teams - certifi - click - # dialogflow, connector for Dialogflow - dnspython - emoji - get-video-properties - ibm-watson - matrix-nio - mattermostdriver - motor - multidict - nbconvert - nbformat - opsdroid-get-image-size - parse - puremagic - pycron - python-olm - pyyaml - regex - rich - slack-sdk - tailer - voluptuous - watchgod - webexteamssdk - wrapt - ] - ++ matrix-nio.optional-dependencies.e2e; + dependencies = with python3Packages; [ + aiohttp + aiohttp-middlewares + aioredis + aiosqlite + appdirs + arrow + babel + bitstring + bleach + # botbuilder-core, connector for teams + certifi + click + # dialogflow, connector for Dialogflow + dnspython + emoji + get-video-properties + ibm-watson + (matrix-nio.override { withOlm = true; }) + mattermostdriver + motor + multidict + nbconvert + nbformat + opsdroid-get-image-size + parse + puremagic + pycron + python-olm + pyyaml + regex + rich + slack-sdk + tailer + voluptuous + watchgod + webexteamssdk + wrapt + ]; passthru.python = python3Packages.python; diff --git a/pkgs/applications/science/robotics/yarp/default.nix b/pkgs/applications/science/robotics/yarp/default.nix index 3b33096dc683..4f2e45384b76 100644 --- a/pkgs/applications/science/robotics/yarp/default.nix +++ b/pkgs/applications/science/robotics/yarp/default.nix @@ -18,11 +18,9 @@ stdenv.mkDerivation rec { "-DYARP_COMPILE_UNMAINTAINED:BOOL=ON" "-DCREATE_YARPC:BOOL=ON" "-DCREATE_YARPCXX:BOOL=ON" + "-DCMAKE_INSTALL_LIBDIR=${placeholder "out"}/lib" ]; - # since we cant expand $out in cmakeFlags - preConfigure = ''cmakeFlags="$cmakeFlags -DCMAKE_INSTALL_LIBDIR=$out/lib"''; - postInstall = "mv ./$out/lib/*.so $out/lib/"; meta = { diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix index 047e2dfda596..0f0996a0dd5d 100644 --- a/pkgs/applications/window-managers/phosh/default.nix +++ b/pkgs/applications/window-managers/phosh/default.nix @@ -17,8 +17,11 @@ , evince , glib , gtk4 -, gnome +, gnome-bluetooth +, gnome-control-center , gnome-desktop +, gnome-session +, gnome-shell , gcr , pam , systemd @@ -71,10 +74,10 @@ stdenv.mkDerivation (finalAttrs: { networkmanager polkit gmobile - gnome.gnome-bluetooth - gnome.gnome-control-center + gnome-bluetooth + gnome-control-center gnome-desktop - gnome.gnome-session + gnome-session gtk4 pam systemd @@ -109,8 +112,8 @@ stdenv.mkDerivation (finalAttrs: { # Depends on GSettings schemas in gnome-shell preFixup = '' gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${gnome.gnome-shell}/share/gsettings-schemas/${gnome.gnome-shell.name}" - --set GNOME_SESSION "${gnome.gnome-session}/bin/gnome-session" + --prefix XDG_DATA_DIRS : "${glib.getSchemaDataDirPath gnome-shell}" + --set GNOME_SESSION "${gnome-session}/bin/gnome-session" ) ''; diff --git a/pkgs/applications/window-managers/xmonad/log-applet/default.nix b/pkgs/applications/window-managers/xmonad/log-applet/default.nix index c31b3c80b8d4..2e6d72b91071 100644 --- a/pkgs/applications/window-managers/xmonad/log-applet/default.nix +++ b/pkgs/applications/window-managers/xmonad/log-applet/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, glib, dbus-glib , desktopSupport ? "gnomeflashback", xorg , gtk2 -, gtk3, gnome, mate +, gtk3, gnome-panel, mate , libxfce4util, xfce4-panel }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ glib dbus-glib xorg.xcbutilwm ] - ++ lib.optionals (desktopSupport == "gnomeflashback") [ gtk3 gnome.gnome-panel ] + ++ lib.optionals (desktopSupport == "gnomeflashback") [ gtk3 gnome-panel ] ++ lib.optionals (desktopSupport == "mate") [ gtk3 mate.mate-panel ] ++ lib.optionals (desktopSupport == "xfce4") [ gtk2 libxfce4util xfce4-panel ] ; diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/by-name/ac/act/package.nix similarity index 79% rename from pkgs/development/tools/misc/act/default.nix rename to pkgs/by-name/ac/act/package.nix index e9877d257e62..33e286e13673 100644 --- a/pkgs/development/tools/misc/act/default.nix +++ b/pkgs/by-name/ac/act/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "act"; - version = "0.2.65"; + version = "0.2.66"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-b2CJMjQr6Eez1xijGpXNkKeYeO87o1a13rB9bA2ShV0="; + hash = "sha256-84ssbd0qF0p2x+cFYwYNW4P79KSZqhvF4Zd6wlRhgLo="; }; - vendorHash = "sha256-AqzhDEan0tdjfbP/nmpfa2e842zR6RyymllNR02zjlM="; + vendorHash = "sha256-fzGnswfzvKhzs7iYnsiQb1c+TTk9+113uj7ryOAvUJk="; doCheck = false; diff --git a/pkgs/by-name/ag/ags/package.nix b/pkgs/by-name/ag/ags/package.nix index 5fd52f72485e..f47dca9aaad4 100644 --- a/pkgs/by-name/ag/ags/package.nix +++ b/pkgs/by-name/ag/ags/package.nix @@ -8,7 +8,7 @@ gobject-introspection, gjs, glib-networking, - gnome, + gnome-bluetooth, gtk-layer-shell, libpulseaudio, libsoup_3, @@ -50,7 +50,7 @@ buildNpmPackage rec { buildInputs = [ gjs glib-networking - gnome.gnome-bluetooth + gnome-bluetooth gtk-layer-shell libpulseaudio libsoup_3 diff --git a/pkgs/by-name/at/atac/package.nix b/pkgs/by-name/at/atac/package.nix index 66d001d21522..2a8ce471e2e1 100644 --- a/pkgs/by-name/at/atac/package.nix +++ b/pkgs/by-name/at/atac/package.nix @@ -9,16 +9,16 @@ }: rustPlatform.buildRustPackage rec { pname = "atac"; - version = "0.16.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "Julien-cpsn"; repo = "ATAC"; rev = "v${version}"; - hash = "sha256-PTslXzgZCzmy45zI2omv4Ef5h4gJdfWcK5ko7ulHnXo="; + hash = "sha256-FSZGpV+dREwjst84TT1aBm/H+VqkjI8XDPo3usJ7UeI="; }; - cargoHash = "sha256-ZQyj2+gsZnayWD29dYZDh1zYTstaQluzzF7pXf0yoY4="; + cargoHash = "sha256-sNgtqvFiwHSYMDf0379i8Yl9NrkCRVLo/ogjbHFgKBY="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ay/ayatana-indicator-session/package.nix b/pkgs/by-name/ay/ayatana-indicator-session/package.nix index 0914bec39610..0ee7f5228624 100644 --- a/pkgs/by-name/ay/ayatana-indicator-session/package.nix +++ b/pkgs/by-name/ay/ayatana-indicator-session/package.nix @@ -7,7 +7,7 @@ cmake, dbus, glib, - gnome, + gnome-settings-daemon, gsettings-desktop-schemas, gtest, intltool, @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { # TODO these bloat the closure size alot, just so the indicator doesn't have the potential to crash. # is there a better way to give it access to DE-specific schemas as needed? # https://github.com/AyatanaIndicators/ayatana-indicator-session/blob/88846bad7ee0aa8e0bb122816d06f9bc887eb464/src/service.c#L1387-L1413 - gnome.gnome-settings-daemon + gnome-settings-daemon mate.mate-settings-daemon ]; diff --git a/pkgs/by-name/bu/budgie-control-center/package.nix b/pkgs/by-name/bu/budgie-control-center/package.nix index 3efe7787db6f..ca114fb1f6ff 100644 --- a/pkgs/by-name/bu/budgie-control-center/package.nix +++ b/pkgs/by-name/bu/budgie-control-center/package.nix @@ -21,9 +21,11 @@ glib-networking, glibc, gnome, + gnome-bluetooth_1_0, gnome-color-manager, gnome-desktop, gnome-remote-desktop, + gnome-settings-daemon, gnome-user-share, gsettings-desktop-schemas, gsound, @@ -46,6 +48,7 @@ libxslt, meson, modemmanager, + mutter, networkmanager, networkmanagerapplet, ninja, @@ -116,11 +119,11 @@ stdenv.mkDerivation (finalAttrs: { gnome-desktop adwaita-icon-theme cheese - gnome.gnome-bluetooth_1_0 + gnome-bluetooth_1_0 gnome-remote-desktop - gnome.gnome-settings-daemon + gnome-settings-daemon gnome-user-share - gnome.mutter + mutter gsettings-desktop-schemas gsound gtk3 @@ -174,7 +177,7 @@ stdenv.mkDerivation (finalAttrs: { --prefix XDG_DATA_DIRS : "${gdk-pixbuf}/share" --prefix XDG_DATA_DIRS : "${librsvg}/share" # WM keyboard shortcuts - --prefix XDG_DATA_DIRS : "${gnome.mutter}/share" + --prefix XDG_DATA_DIRS : "${mutter}/share" ) ''; diff --git a/pkgs/by-name/bu/budgie-desktop/package.nix b/pkgs/by-name/bu/budgie-desktop/package.nix index e75704944f7a..74d9d2c35a94 100644 --- a/pkgs/by-name/bu/budgie-desktop/package.nix +++ b/pkgs/by-name/bu/budgie-desktop/package.nix @@ -7,8 +7,8 @@ budgie-screensaver, docbook-xsl-nons, glib, - gnome, gnome-desktop, + gnome-settings-daemon, graphene, gst_all_1, gtk-doc, @@ -26,6 +26,7 @@ magpie, mesa, meson, + mutter, ninja, nix-update-script, nixosTests, @@ -79,8 +80,8 @@ stdenv.mkDerivation (finalAttrs: { budgie-screensaver glib gnome-desktop - gnome.gnome-settings-daemon - gnome.mutter + gnome-settings-daemon + mutter zenity graphene gst_all_1.gstreamer diff --git a/pkgs/by-name/bu/budgie-gsettings-overrides/package.nix b/pkgs/by-name/bu/budgie-gsettings-overrides/package.nix index f45a033a8732..02bd605ee3cf 100644 --- a/pkgs/by-name/bu/budgie-gsettings-overrides/package.nix +++ b/pkgs/by-name/bu/budgie-gsettings-overrides/package.nix @@ -5,7 +5,7 @@ budgie-desktop-view, glib, gsettings-desktop-schemas, - gnome, + mutter, nixos-artwork, nixos-background-light ? nixos-artwork.wallpapers.nineish, nixos-background-dark ? nixos-artwork.wallpapers.nineish-dark-gray, @@ -59,7 +59,7 @@ let budgie-desktop budgie-desktop-view gsettings-desktop-schemas - gnome.mutter + mutter ] ++ extraGSettingsOverridePackages; in diff --git a/pkgs/by-name/bu/budgie-session/package.nix b/pkgs/by-name/bu/budgie-session/package.nix index 0dfd4dc60824..407902d824e7 100644 --- a/pkgs/by-name/bu/budgie-session/package.nix +++ b/pkgs/by-name/bu/budgie-session/package.nix @@ -6,12 +6,12 @@ meson, ninja, pkg-config, - gnome, adwaita-icon-theme, glib, gtk3, gsettings-desktop-schemas, gnome-desktop, + gnome-settings-daemon, dbus, json-glib, libICE, @@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: { json-glib xorg.xtrans adwaita-icon-theme - gnome.gnome-settings-daemon + gnome-settings-daemon gsettings-desktop-schemas systemd libepoxy @@ -94,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: { wrapProgram "$out/libexec/budgie-session-binary" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \ - --suffix XDG_CONFIG_DIRS : "${gnome.gnome-settings-daemon}/etc/xdg" + --suffix XDG_CONFIG_DIRS : "${gnome-settings-daemon}/etc/xdg" ''; separateDebugInfo = true; diff --git a/pkgs/by-name/ca/catppuccin-cursors/package.nix b/pkgs/by-name/ca/catppuccin-cursors/package.nix index 1a46f4370bfb..604b04e50e0c 100644 --- a/pkgs/by-name/ca/catppuccin-cursors/package.nix +++ b/pkgs/by-name/ca/catppuccin-cursors/package.nix @@ -5,6 +5,7 @@ , just , xcursorgen , hyprcursor +, xcur2png }: let @@ -14,7 +15,7 @@ let }; variantName = { palette, color }: palette + color; variants = lib.mapCartesianProduct variantName dimensions; - version = "0.3.0"; + version = "0.3.1"; in stdenvNoCC.mkDerivation { pname = "catppuccin-cursors"; @@ -24,10 +25,10 @@ stdenvNoCC.mkDerivation { owner = "catppuccin"; repo = "cursors"; rev = "v${version}"; - hash = "sha256-LJyBnXDUGBLOD4qPI7l0YC0CcqYTtgoMJc1H2yLqk9g="; + hash = "sha256-CuzD6O/RImFKLWzJoiUv7nlIdoXNvwwl+k5mTeVIY10="; }; - nativeBuildInputs = [ just inkscape xcursorgen hyprcursor ]; + nativeBuildInputs = [ just inkscape xcursorgen hyprcursor xcur2png ]; outputs = variants ++ [ "out" ]; # dummy "out" output to prevent breakage diff --git a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix b/pkgs/by-name/ci/cirrus-cli/package.nix similarity index 86% rename from pkgs/development/tools/continuous-integration/cirrus-cli/default.nix rename to pkgs/by-name/ci/cirrus-cli/package.nix index 4e2fa7b6234d..508dc9614d6e 100644 --- a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix +++ b/pkgs/by-name/ci/cirrus-cli/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "cirrus-cli"; - version = "0.122.4"; + version = "0.124.2"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = "v${version}"; - hash = "sha256-YpdzwGThmc9r4I+Rx8nxTZToi+J3UbqwZD+F2hYEG8M="; + hash = "sha256-S57ApSuO3Mo/GpoaXx0dKOU3CfdQXmPM8AWi8fZ9MfY="; }; - vendorHash = "sha256-WAYjYIHsBkQiTUmMDRXnx3Q1UAFVfXmZDFxzw7Kh0ds="; + vendorHash = "sha256-BbBwia47E6EtoEzO2c2fhjg6WHGHTnzl5VyVYxIMu6E="; ldflags = [ "-X github.com/cirruslabs/cirrus-cli/internal/version.Version=v${version}" diff --git a/pkgs/by-name/cs/csvtk/package.nix b/pkgs/by-name/cs/csvtk/package.nix new file mode 100644 index 000000000000..4079b55f9835 --- /dev/null +++ b/pkgs/by-name/cs/csvtk/package.nix @@ -0,0 +1,30 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: +let + version = "0.30.0"; +in +buildGoModule { + pname = "csvtk"; + inherit version; + + src = fetchFromGitHub { + owner = "shenwei356"; + repo = "csvtk"; + rev = "refs/tags/v${version}"; + hash = "sha256-xq56dErO0vjG9bZ5aISIFWX4IOHaQksE9W1is2HiFuQ="; + }; + + vendorHash = "sha256-wJedDF7QIg8oWc/QX+rZDyq/nkAW+PMb8EYb0RGJxQM="; + + meta = { + description = "Cross-platform, efficient and practical CSV/TSV toolkit in Golang"; + changelog = "https://github.com/shenwei356/csvtk/releases/tag/v${version}"; + homepage = "https://github.com/shenwei356/csvtk"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ luftmensch-luftmensch ]; + mainProgram = "csvtk"; + }; +} diff --git a/pkgs/by-name/ff/fflogs/package.nix b/pkgs/by-name/ff/fflogs/package.nix index 50526b45a1cb..08631635cbf6 100644 --- a/pkgs/by-name/ff/fflogs/package.nix +++ b/pkgs/by-name/ff/fflogs/package.nix @@ -5,10 +5,10 @@ let pname = "fflogs"; - version = "8.12.19"; + version = "8.13.1"; src = fetchurl { url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage"; - hash = "sha256-/TGmUHMNowQFIw09OGw1ybiYE7ADPLbsZpAMPw3G5NE="; + hash = "sha256-NSLJo+6o30bF2+1c1mHdHGC5GoZUjzC0JYJ5x/tY4uQ="; }; extracted = appimageTools.extractType2 { inherit pname version src; }; in diff --git a/pkgs/desktops/gnome/games/gnome-2048/default.nix b/pkgs/by-name/gn/gnome-2048/package.nix similarity index 79% rename from pkgs/desktops/gnome/games/gnome-2048/default.nix rename to pkgs/by-name/gn/gnome-2048/package.nix index fc04ee0b8f1e..88e373497bbe 100644 --- a/pkgs/desktops/gnome/games/gnome-2048/default.nix +++ b/pkgs/by-name/gn/gnome-2048/package.nix @@ -1,26 +1,27 @@ -{ lib -, stdenv -, fetchurl -, fetchpatch -, wrapGAppsHook3 -, meson -, vala -, pkg-config -, ninja -, itstool -, clutter-gtk -, libgee -, libgnome-games-support -, gnome -, gtk3 +{ + lib, + stdenv, + fetchurl, + fetchpatch, + wrapGAppsHook3, + meson, + vala, + pkg-config, + ninja, + itstool, + clutter-gtk, + libgee, + libgnome-games-support, + gnome, + gtk3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-twenty-forty-eight"; version = "3.38.2"; src = fetchurl { - url = "mirror://gnome/sources/gnome-2048/${lib.versions.majorMinor version}/gnome-2048-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-2048/${lib.versions.majorMinor finalAttrs.version}/gnome-2048-${finalAttrs.version}.tar.xz"; sha256 = "0s5fg4z5in1h39fcr69j1qc5ynmg7a8mfprk3mc3c0csq3snfwz2"; }; @@ -63,4 +64,4 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/desktops/gnome/misc/gnome-applets/default.nix b/pkgs/by-name/gn/gnome-applets/package.nix similarity index 69% rename from pkgs/desktops/gnome/misc/gnome-applets/default.nix rename to pkgs/by-name/gn/gnome-applets/package.nix index 0270045dad7d..65edba55cb08 100644 --- a/pkgs/desktops/gnome/misc/gnome-applets/default.nix +++ b/pkgs/by-name/gn/gnome-applets/package.nix @@ -1,32 +1,34 @@ -{ lib, stdenv -, fetchurl -, gettext -, itstool -, libxml2 -, pkg-config -, gnome-panel -, gtk3 -, glib -, libwnck -, libgtop -, libnotify -, upower -, wirelesstools -, linuxPackages -, adwaita-icon-theme -, libgweather -, gucharmap -, tracker -, polkit -, gnome +{ + lib, + stdenv, + fetchurl, + gettext, + itstool, + libxml2, + pkg-config, + gnome-panel, + gtk3, + glib, + libwnck, + libgtop, + libnotify, + upower, + wirelesstools, + linuxPackages, + adwaita-icon-theme, + libgweather, + gucharmap, + tracker, + polkit, + gnome, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-applets"; version = "3.52.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-applets/${lib.versions.majorMinor finalAttrs.version}/gnome-applets-${finalAttrs.version}.tar.xz"; hash = "sha256-bz07QoZW/21bHT7lzLfs49Kxi1S/BFes9DtxHlXi1iw="; }; @@ -64,8 +66,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; - attrPath = "gnome.${pname}"; + packageName = "gnome-applets"; versionPolicy = "odd-unstable"; }; }; @@ -78,4 +79,4 @@ stdenv.mkDerivation rec { maintainers = teams.gnome.members; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/desktops/gnome/core/gnome-bluetooth/1.0/default.nix b/pkgs/by-name/gn/gnome-bluetooth/1.0/default.nix similarity index 69% rename from pkgs/desktops/gnome/core/gnome-bluetooth/1.0/default.nix rename to pkgs/by-name/gn/gnome-bluetooth/1.0/default.nix index 6c63a486eef7..e72398326bf9 100644 --- a/pkgs/desktops/gnome/core/gnome-bluetooth/1.0/default.nix +++ b/pkgs/by-name/gn/gnome-bluetooth/1.0/default.nix @@ -1,38 +1,44 @@ -{ stdenv -, lib -, fetchurl -, fetchpatch -, gnome -, adwaita-icon-theme -, meson -, ninja -, pkg-config -, gtk3 -, gettext -, glib -, udev -, itstool -, libxml2 -, wrapGAppsHook3 -, libnotify -, libcanberra-gtk3 -, gobject-introspection -, gtk-doc -, docbook-xsl-nons -, docbook_xml_dtd_43 -, python3 -, gsettings-desktop-schemas +{ + stdenv, + lib, + fetchurl, + fetchpatch, + gnome, + adwaita-icon-theme, + meson, + ninja, + pkg-config, + gtk3, + gettext, + glib, + udev, + itstool, + libxml2, + wrapGAppsHook3, + libnotify, + libcanberra-gtk3, + gobject-introspection, + gtk-doc, + docbook-xsl-nons, + docbook_xml_dtd_43, + python3, + gsettings-desktop-schemas, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-bluetooth"; version = "3.34.5"; # TODO: split out "lib" - outputs = [ "out" "dev" "devdoc" "man" ]; + outputs = [ + "out" + "dev" + "devdoc" + "man" + ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-bluetooth/${lib.versions.majorMinor finalAttrs.version}/gnome-bluetooth-${finalAttrs.version}.tar.xz"; sha256 = "bJSeUsi+zCBU2qzWBJAfZs5c9wml+pHEu3ysyTm1Pqk="; }; @@ -82,8 +88,8 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; - attrPath = "gnome.gnome-bluetooth_1_0"; + packageName = "gnome-bluetooth"; + attrPath = "gnome-bluetooth_1_0"; freeze = true; }; }; @@ -96,4 +102,4 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix b/pkgs/by-name/gn/gnome-bluetooth/package.nix similarity index 92% rename from pkgs/desktops/gnome/core/gnome-bluetooth/default.nix rename to pkgs/by-name/gn/gnome-bluetooth/package.nix index 9e4944221c15..fe50b0958dec 100644 --- a/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix +++ b/pkgs/by-name/gn/gnome-bluetooth/package.nix @@ -26,7 +26,7 @@ gsettings-desktop-schemas, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-bluetooth"; version = "46.1"; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "mirror://gnome/sources/gnome-bluetooth/${lib.versions.major version}/gnome-bluetooth-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-bluetooth/${lib.versions.major finalAttrs.version}/gnome-bluetooth-${finalAttrs.version}.tar.xz"; hash = "sha256-VsRKFwNFmOlgdFivrhvnXz3l798OYjVfCbpY/HvDEqw="; }; @@ -74,7 +74,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = "gnome-bluetooth"; - attrPath = "gnome.gnome-bluetooth"; }; }; @@ -86,4 +85,4 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/desktops/gnome/core/gnome-control-center/default.nix b/pkgs/by-name/gn/gnome-control-center/package.nix similarity index 70% rename from pkgs/desktops/gnome/core/gnome-control-center/default.nix rename to pkgs/by-name/gn/gnome-control-center/package.nix index 59f8b2b8e746..d5b1dd84c925 100644 --- a/pkgs/desktops/gnome/core/gnome-control-center/default.nix +++ b/pkgs/by-name/gn/gnome-control-center/package.nix @@ -1,74 +1,75 @@ -{ fetchurl -, lib -, stdenv -, substituteAll -, accountsservice -, adwaita-icon-theme -, colord -, colord-gtk4 -, cups -, dbus -, docbook-xsl-nons -, fontconfig -, gdk-pixbuf -, gettext -, glib -, glib-networking -, gcr_4 -, glibc -, gnome-bluetooth -, gnome-color-manager -, gnome-desktop -, gnome-online-accounts -, gnome-settings-daemon -, gnome-tecla -, gnome -, gsettings-desktop-schemas -, gsound -, gst_all_1 -, gtk4 -, ibus -, json-glib -, libgtop -, libgudev -, libadwaita -, libkrb5 -, libjxl -, libpulseaudio -, libpwquality -, librsvg -, webp-pixbuf-loader -, libsecret -, libsoup_3 -, libwacom -, libXi -, libxml2 -, libxslt -, meson -, modemmanager -, mutter -, networkmanager -, networkmanagerapplet -, libnma-gtk4 -, ninja -, pkg-config -, polkit -, python3 -, samba -, setxkbmap -, shadow -, shared-mime-info -, sound-theme-freedesktop -, tracker -, tracker-miners -, tzdata -, udisks2 -, upower -, libepoxy -, gnome-user-share -, gnome-remote-desktop -, wrapGAppsHook4 -, xorgserver +{ + fetchurl, + lib, + stdenv, + substituteAll, + accountsservice, + adwaita-icon-theme, + colord, + colord-gtk4, + cups, + dbus, + docbook-xsl-nons, + fontconfig, + gdk-pixbuf, + gettext, + glib, + glib-networking, + gcr_4, + glibc, + gnome-bluetooth, + gnome-color-manager, + gnome-desktop, + gnome-online-accounts, + gnome-settings-daemon, + gnome-tecla, + gnome, + gsettings-desktop-schemas, + gsound, + gst_all_1, + gtk4, + ibus, + json-glib, + libgtop, + libgudev, + libadwaita, + libkrb5, + libjxl, + libpulseaudio, + libpwquality, + librsvg, + webp-pixbuf-loader, + libsecret, + libsoup_3, + libwacom, + libXi, + libxml2, + libxslt, + meson, + modemmanager, + mutter, + networkmanager, + networkmanagerapplet, + libnma-gtk4, + ninja, + pkg-config, + polkit, + python3, + samba, + setxkbmap, + shadow, + shared-mime-info, + sound-theme-freedesktop, + tracker, + tracker-miners, + tzdata, + udisks2, + upower, + libepoxy, + gnome-user-share, + gnome-remote-desktop, + wrapGAppsHook4, + xorgserver, }: stdenv.mkDerivation (finalAttrs: { @@ -147,11 +148,10 @@ stdenv.mkDerivation (finalAttrs: { tracker-miners # for search locations dialog udisks2 upower - ] ++ (with gst_all_1; [ # For animations in Mouse panel. - gst-plugins-base - gst-plugins-good - ]); + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + ]; nativeCheckInputs = [ dbus @@ -177,13 +177,15 @@ stdenv.mkDerivation (finalAttrs: { postInstall = '' # Pull in WebP and JXL support for gnome-backgrounds. # In postInstall to run before gappsWrapperArgsHook. - export GDK_PIXBUF_MODULE_FILE="${gnome._gdkPixbufCacheBuilder_DO_NOT_USE { - extraLoaders = [ - libjxl - librsvg - webp-pixbuf-loader - ]; - }}" + export GDK_PIXBUF_MODULE_FILE="${ + gnome._gdkPixbufCacheBuilder_DO_NOT_USE { + extraLoaders = [ + libjxl + librsvg + webp-pixbuf-loader + ]; + } + }" ''; preFixup = '' @@ -205,7 +207,6 @@ stdenv.mkDerivation (finalAttrs: { passthru = { updateScript = gnome.updateScript { packageName = "gnome-control-center"; - attrPath = "gnome.gnome-control-center"; }; }; diff --git a/pkgs/desktops/gnome/core/gnome-control-center/paths.patch b/pkgs/by-name/gn/gnome-control-center/paths.patch similarity index 100% rename from pkgs/desktops/gnome/core/gnome-control-center/paths.patch rename to pkgs/by-name/gn/gnome-control-center/paths.patch diff --git a/pkgs/by-name/gn/gnome-disk-utility/package.nix b/pkgs/by-name/gn/gnome-disk-utility/package.nix index dd65e5727623..f93a877bc018 100644 --- a/pkgs/by-name/gn/gnome-disk-utility/package.nix +++ b/pkgs/by-name/gn/gnome-disk-utility/package.nix @@ -15,6 +15,7 @@ , libnotify , itstool , gnome +, gnome-settings-daemon , adwaita-icon-theme , libxml2 , gsettings-desktop-schemas @@ -60,7 +61,7 @@ stdenv.mkDerivation rec { udisks2 adwaita-icon-theme systemd - gnome.gnome-settings-daemon + gnome-settings-daemon gsettings-desktop-schemas ]; diff --git a/pkgs/by-name/gn/gnome-flashback/package.nix b/pkgs/by-name/gn/gnome-flashback/package.nix new file mode 100644 index 000000000000..cfd2913d356b --- /dev/null +++ b/pkgs/by-name/gn/gnome-flashback/package.nix @@ -0,0 +1,222 @@ +{ + stdenv, + lib, + autoreconfHook, + fetchurl, + gettext, + glib, + gnome-bluetooth, + gnome-desktop, + gnome-panel, + gnome-session, + gnome, + gsettings-desktop-schemas, + gtk3, + ibus, + libcanberra-gtk3, + libpulseaudio, + libxkbfile, + libxml2, + pkg-config, + polkit, + gdm, + systemd, + upower, + pam, + wrapGAppsHook3, + writeTextFile, + xkeyboard_config, + xorg, + nixosTests, + runCommand, + buildEnv, +}: + +let + # From data/sessions/Makefile.am + requiredComponentsCommon = enableGnomePanel: [ ] ++ lib.optional enableGnomePanel "gnome-panel"; + requiredComponentsGsd = [ + "org.gnome.SettingsDaemon.A11ySettings" + "org.gnome.SettingsDaemon.Color" + "org.gnome.SettingsDaemon.Datetime" + "org.gnome.SettingsDaemon.Housekeeping" + "org.gnome.SettingsDaemon.Keyboard" + "org.gnome.SettingsDaemon.MediaKeys" + "org.gnome.SettingsDaemon.Power" + "org.gnome.SettingsDaemon.PrintNotifications" + "org.gnome.SettingsDaemon.Rfkill" + "org.gnome.SettingsDaemon.ScreensaverProxy" + "org.gnome.SettingsDaemon.Sharing" + "org.gnome.SettingsDaemon.Smartcard" + "org.gnome.SettingsDaemon.Sound" + "org.gnome.SettingsDaemon.UsbProtection" + "org.gnome.SettingsDaemon.Wacom" + "org.gnome.SettingsDaemon.XSettings" + ]; + requiredComponents = + wmName: enableGnomePanel: + "RequiredComponents=${ + lib.concatStringsSep ";" ( + [ wmName ] ++ requiredComponentsCommon enableGnomePanel ++ requiredComponentsGsd + ) + };"; +in +stdenv.mkDerivation (finalAttrs: { + pname = "gnome-flashback"; + version = "3.52.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-flashback/${lib.versions.majorMinor finalAttrs.version}/gnome-flashback-${finalAttrs.version}.tar.xz"; + hash = "sha256-ugRhPNrbYr2iBkN8BHKZ4WAlzeG9gJXglKp3dpx4YDo="; + }; + + # make .desktop Execs absolute + postPatch = '' + patch -p0 <' -i src/work_pool.c diff --git a/pkgs/development/libraries/openwsman/default.nix b/pkgs/development/libraries/openwsman/default.nix index 4df98d28fd09..a12abd5db557 100644 --- a/pkgs/development/libraries/openwsman/default.nix +++ b/pkgs/development/libraries/openwsman/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; preConfigure = '' - cmakeFlags="$cmakeFlags -DPACKAGE_ARCHITECTURE=$(uname -m)"; + appendToVar cmakeFlags "-DPACKAGE_ARCHITECTURE=$(uname -m)" ''; configureFlags = [ "--disable-more-warnings" ]; diff --git a/pkgs/development/libraries/raylib/default.nix b/pkgs/development/libraries/raylib/default.nix index 944896d1cf57..2cdde4f2b726 100644 --- a/pkgs/development/libraries/raylib/default.nix +++ b/pkgs/development/libraries/raylib/default.nix @@ -36,9 +36,8 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - autoPatchelfHook cmake - ]; + ] ++ lib.optional stdenv.isLinux autoPatchelfHook; buildInputs = [ glfw ] ++ lib.optionals stdenv.isLinux [ mesa libXi libXcursor libXrandr libXinerama ] @@ -71,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { ]; # fix libasound.so/libpulse.so not being found - appendRunpaths = [ + appendRunpaths = lib.optionals stdenv.isLinux [ (lib.makeLibraryPath (lib.optional alsaSupport alsa-lib ++ lib.optional pulseSupport libpulseaudio)) ]; diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix index 7db1d0d49195..34bd608de8e2 100644 --- a/pkgs/development/libraries/vigra/default.nix +++ b/pkgs/development/libraries/vigra/default.nix @@ -1,17 +1,18 @@ -{ lib -, stdenv -, fetchFromGitHub -, boost -, cmake -, fftw -, fftwSinglePrec -, hdf5 -, ilmbase -, libjpeg -, libpng -, libtiff -, openexr -, python3 +{ + lib, + stdenv, + fetchFromGitHub, + boost, + cmake, + fftw, + fftwSinglePrec, + hdf5, + ilmbase, + libjpeg, + libpng, + libtiff, + openexr, + python3, }: let @@ -44,11 +45,15 @@ stdenv.mkDerivation rec { python ]; - preConfigure = "cmakeFlags+=\" -DVIGRANUMPY_INSTALL_DIR=$out/${python.sitePackages}\""; - - cmakeFlags = [ "-DWITH_OPENEXR=1" ] - ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-linux") - [ "-DCMAKE_CXX_FLAGS=-fPIC" "-DCMAKE_C_FLAGS=-fPIC" ]; + cmakeFlags = + [ + "-DWITH_OPENEXR=1" + "-DVIGRANUMPY_INSTALL_DIR=${placeholder "out"}/${python.sitePackages}" + ] + ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-linux") [ + "-DCMAKE_CXX_FLAGS=-fPIC" + "-DCMAKE_C_FLAGS=-fPIC" + ]; meta = with lib; { description = "Novel computer vision C++ library with customizable algorithms and data structures"; diff --git a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix index e1a51284927a..a1d01682f22e 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix @@ -6,7 +6,7 @@ , pkg-config , xdg-desktop-portal , gtk3 -, gnome +, gnome-settings-daemon , gnome-desktop , glib , wrapGAppsHook3 @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals buildPortalsInGnome [ gsettings-desktop-schemas # settings exposed by settings portal gnome-desktop - gnome.gnome-settings-daemon # schemas needed for settings api (mostly useless now that fonts were moved to g-d-s, just mouse and xsettings) + gnome-settings-daemon # schemas needed for settings api (mostly useless now that fonts were moved to g-d-s, just mouse and xsettings) ]; mesonFlags = lib.optionals (!buildPortalsInGnome) [ diff --git a/pkgs/development/python-modules/cirq-core/default.nix b/pkgs/development/python-modules/cirq-core/default.nix index e12dc6f3255e..b2cf178596b5 100644 --- a/pkgs/development/python-modules/cirq-core/default.nix +++ b/pkgs/development/python-modules/cirq-core/default.nix @@ -1,39 +1,38 @@ { lib, stdenv, - buildPythonPackage, - pythonOlder, - fetchFromGitHub, attrs, + autoray ? null, + buildPythonPackage, duet, + fetchFromGitHub, + freezegun, matplotlib, networkx, numpy, + opt-einsum, pandas, + ply, + pylatex ? null, + pyquil ? null, + pytest-asyncio, + pytestCheckHook, + pythonOlder, + quimb ? null, requests, scipy, + setuptools, sortedcontainers, sympy, tqdm, typing-extensions, - # Contrib requirements withContribRequires ? false, - autoray ? null, - opt-einsum, - ply, - pylatex ? null, - pyquil ? null, - quimb ? null, - # test inputs - pytestCheckHook, - freezegun, - pytest-asyncio, }: buildPythonPackage rec { pname = "cirq-core"; - version = "1.4.0"; - format = "setuptools"; + version = "1.4.1"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -41,7 +40,7 @@ buildPythonPackage rec { owner = "quantumlib"; repo = "cirq"; rev = "refs/tags/v${version}"; - hash = "sha256-KHwVq0qVtc8E9i2lugILYNwk9awq952w0x4DM+HG7Pg="; + hash = "sha256-1GcRDVgYF+1igZQFlQbiWZmU1WNIJh4CcOftQe6OP6I="; }; sourceRoot = "${src.name}/${pname}"; @@ -51,7 +50,9 @@ buildPythonPackage rec { --replace "matplotlib~=3.0" "matplotlib" ''; - propagatedBuildInputs = + build-system = [ setuptools ]; + + dependencies = [ attrs duet diff --git a/pkgs/development/python-modules/cirq-ft/default.nix b/pkgs/development/python-modules/cirq-ft/default.nix deleted file mode 100644 index 6ee4c28c8879..000000000000 --- a/pkgs/development/python-modules/cirq-ft/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - attrs, - buildPythonPackage, - cachetools, - cirq-core, - ipython, - ipywidgets, - nbconvert, - nbformat, - pytestCheckHook, - setuptools, -}: - -buildPythonPackage rec { - pname = "cirq-ft"; - pyproject = true; - inherit (cirq-core) version src meta; - - sourceRoot = "${src.name}/${pname}"; - - nativeBuildInputs = [ setuptools ]; - - propagatedBuildInputs = [ - attrs - cachetools - cirq-core - ipython - ipywidgets - nbconvert - nbformat - ]; - - nativeCheckInputs = [ - ipython - pytestCheckHook - ]; - - disabledTests = [ - # Upstream doesn't always adjust the version - "test_version" - ]; - - # cirq's importlib hook doesn't work here - #pythonImportsCheck = [ "cirq_ft" ]; -} diff --git a/pkgs/development/python-modules/cirq-rigetti/default.nix b/pkgs/development/python-modules/cirq-rigetti/default.nix index 932ab71a1500..d6848fe013a4 100644 --- a/pkgs/development/python-modules/cirq-rigetti/default.nix +++ b/pkgs/development/python-modules/cirq-rigetti/default.nix @@ -84,9 +84,4 @@ buildPythonPackage rec { # cirq's importlib hook doesn't work here #pythonImportsCheck = [ "cirq_rigetti" ]; - - meta = cirq-core.meta // { - # ModuleNotFoundError: No module named 'pyquil.parser' - broken = lib.versionAtLeast pyquil.version "4"; - }; } diff --git a/pkgs/development/python-modules/cirq/default.nix b/pkgs/development/python-modules/cirq/default.nix index d640655c4cd8..54eee66b5f20 100644 --- a/pkgs/development/python-modules/cirq/default.nix +++ b/pkgs/development/python-modules/cirq/default.nix @@ -2,7 +2,6 @@ buildPythonPackage, cirq-aqt, cirq-core, - cirq-ft, cirq-google, cirq-ionq, cirq-pasqal, @@ -19,7 +18,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ cirq-aqt cirq-core - cirq-ft cirq-ionq cirq-google cirq-rigetti @@ -34,7 +32,6 @@ buildPythonPackage rec { disabledTestPaths = [ "cirq-aqt" "cirq-core" - "cirq-ft" "cirq-google" "cirq-ionq" "cirq-pasqal" diff --git a/pkgs/development/python-modules/doc8/default.nix b/pkgs/development/python-modules/doc8/default.nix index bd47412044f6..68c9377d3bff 100644 --- a/pkgs/development/python-modules/doc8/default.nix +++ b/pkgs/development/python-modules/doc8/default.nix @@ -53,6 +53,8 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; + pythonRelaxDeps = [ "docutils" ]; + pythonImportsCheck = [ "doc8" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/duet/default.nix b/pkgs/development/python-modules/duet/default.nix index de9685345ba1..2f9720bc0de1 100644 --- a/pkgs/development/python-modules/duet/default.nix +++ b/pkgs/development/python-modules/duet/default.nix @@ -3,25 +3,33 @@ buildPythonPackage, fetchFromGitHub, pytestCheckHook, + pythonOlder, + setuptools, typing-extensions, }: buildPythonPackage rec { pname = "duet"; - version = "0.2.7"; - format = "setuptools"; + version = "0.2.9"; + pyproject = true; + + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "google"; repo = "duet"; - rev = "v${version}"; - hash = "sha256-9CTAupAxZI1twoLpgr7VfECw70QunE6pk+SskiT3JDw="; + rev = "refs/tags/v${version}"; + hash = "sha256-P7JxUigD7ZyhtocV+YuAVxuUYVa4F7PpXuA1CCmcMvg="; }; - propagatedBuildInputs = [ typing-extensions ]; + build-system = [ setuptools ]; + + dependencies = [ typing-extensions ]; nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "duet" ]; + meta = with lib; { description = "Simple future-based async library for python"; homepage = "https://github.com/google/duet"; diff --git a/pkgs/development/python-modules/dvc/default.nix b/pkgs/development/python-modules/dvc/default.nix index 94f598abbe19..a0b4f33ad3ee 100644 --- a/pkgs/development/python-modules/dvc/default.nix +++ b/pkgs/development/python-modules/dvc/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { pname = "dvc"; - version = "3.55.0"; + version = "3.55.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -66,7 +66,7 @@ buildPythonPackage rec { owner = "iterative"; repo = "dvc"; rev = "refs/tags/${version}"; - hash = "sha256-nKzMHVMaoDu/d1wMAxA2q8DHdwoIb7+YG/7AhAtRVEM="; + hash = "sha256-DrhjmVHCX1lXJUrklVgO/eguL1uRQ33kJjSgCAEIyew="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/gguf/default.nix b/pkgs/development/python-modules/gguf/default.nix index f0edfa48049f..64b96698cc62 100644 --- a/pkgs/development/python-modules/gguf/default.nix +++ b/pkgs/development/python-modules/gguf/default.nix @@ -5,26 +5,26 @@ numpy, poetry-core, pythonOlder, + tqdm, }: buildPythonPackage rec { pname = "gguf"; - version = "0.6.0"; + version = "0.9.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-suIuq6KhBsGtFIGGoUrZ8pxCk1Fob+nXzhbfOaBgfmU="; + hash = "sha256-9ecJh+FbGcVF9qn3UztAM/swYzDrHzxclf0osUw/0zs="; }; dependencies = [ numpy poetry-core + tqdm ]; - doCheck = false; - meta = with lib; { description = "Module for writing binary files in the GGUF format"; homepage = "https://ggml.ai/"; diff --git a/pkgs/development/python-modules/hoomd-blue/default.nix b/pkgs/development/python-modules/hoomd-blue/default.nix index e48cc94bccc4..248a2f8cb258 100644 --- a/pkgs/development/python-modules/hoomd-blue/default.nix +++ b/pkgs/development/python-modules/hoomd-blue/default.nix @@ -49,13 +49,9 @@ buildPythonPackage rec { "-DBUILD_HPMC=${onOffBool components.hpmc}" "-DBUILD_MD=${onOffBool components.md}" "-DBUILD_METAL=${onOffBool components.metal}" + "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/${python.sitePackages}" ]; - preConfigure = '' - # Since we can't expand $out in `cmakeFlags` - cmakeFlags="$cmakeFlags -DCMAKE_INSTALL_PREFIX=$out/${python.sitePackages}" - ''; - # tests fail but have tested that package runs properly doCheck = false; checkTarget = "test"; diff --git a/pkgs/development/python-modules/howdoi/default.nix b/pkgs/development/python-modules/howdoi/default.nix index 53995d2de5d7..db109c2f70ee 100644 --- a/pkgs/development/python-modules/howdoi/default.nix +++ b/pkgs/development/python-modules/howdoi/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, appdirs, buildPythonPackage, @@ -7,6 +6,7 @@ colorama, cssselect, fetchFromGitHub, + fetchpatch, keep, lxml, pygments, @@ -31,6 +31,16 @@ buildPythonPackage rec { hash = "sha256-u0k+h7Sp2t/JUnfPqRzDpEA+vNXB7CpyZ/SRvk+B9t0="; }; + patches = [ + # Bad test case fix: comparing hardcoded string to internet search result + # PR merged: https://github.com/gleitz/howdoi/pull/497 + # Please remove on the next release + (fetchpatch { + url = "https://github.com/gleitz/howdoi/commit/7d24e9e1c87811a6e66d60f504381383cf1ac3fd.patch"; + sha256 = "sha256-AFQMnMEijaExqiimbNaVeIRmZJ4Yj0nGUOEjfsvBLh8="; + }) + ]; + propagatedBuildInputs = [ appdirs cachelib @@ -55,7 +65,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "howdoi" ]; meta = with lib; { - broken = stdenv.isDarwin; changelog = "https://github.com/gleitz/howdoi/blob/v${version}/CHANGES.txt"; description = "Instant coding answers via the command line"; homepage = "https://github.com/gleitz/howdoi"; diff --git a/pkgs/development/python-modules/llama-cloud/default.nix b/pkgs/development/python-modules/llama-cloud/default.nix index f949eef4cf6b..467dd9685c1c 100644 --- a/pkgs/development/python-modules/llama-cloud/default.nix +++ b/pkgs/development/python-modules/llama-cloud/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-cloud"; - version = "0.0.11"; + version = "0.0.15"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_cloud"; inherit version; - hash = "sha256-EAiCtSiJIGUhFDbaBIJS1X7KFNhoPS/eb4nusglQrBg="; + hash = "sha256-vgb9iI6IliN5a5wqoPwNCe8DntUUX/Jn2ECMy+pwwEg="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-agent-openai/default.nix b/pkgs/development/python-modules/llama-index-agent-openai/default.nix index c7a1d2e46676..41fe1b667abf 100644 --- a/pkgs/development/python-modules/llama-index-agent-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-agent-openai/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-agent-openai"; - version = "0.2.9"; + version = "0.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_agent_openai"; inherit version; - hash = "sha256-3r6G2m2dmD2zK0Rd3KfHmKwUD+WVc7r97XNZWzmV89U="; + hash = "sha256-2t5w6LmHGU16+2kl9yMGDp9JU+sTRADaL81M7t8sPf8="; }; pythonRelaxDeps = [ "llama-index-llms-openai" ]; diff --git a/pkgs/development/python-modules/llama-index-cli/default.nix b/pkgs/development/python-modules/llama-index-cli/default.nix index 5d6795dce972..264316d0d626 100644 --- a/pkgs/development/python-modules/llama-index-cli/default.nix +++ b/pkgs/development/python-modules/llama-index-cli/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "llama-index-cli"; - version = "0.1.13"; + version = "0.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_cli"; inherit version; - hash = "sha256-hhR97UQ5+6sdbHwNcujyMdKTXan99cnT8N3k811Eqlk="; + hash = "sha256-pC4B/ioCqg/TtkXrFAP5BY+n9i++6ioGpVt/uMB9XQI="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-core/default.nix b/pkgs/development/python-modules/llama-index-core/default.nix index f6dab9b1f0fb..039ccc9a263c 100644 --- a/pkgs/development/python-modules/llama-index-core/default.nix +++ b/pkgs/development/python-modules/llama-index-core/default.nix @@ -47,7 +47,7 @@ in buildPythonPackage rec { pname = "llama-index-core"; - version = "0.10.60"; + version = "0.11.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -56,7 +56,7 @@ buildPythonPackage rec { owner = "run-llama"; repo = "llama_index"; rev = "refs/tags/v${version}"; - hash = "sha256-CH/YTG0/SVDhwY1iN+K1s7cdTDFDZboO6N9208qLFf4="; + hash = "sha256-bgkuX7ukN7aEnaUyIbPQ7FoUtsUT9Tq326RQgXNnOpg="; }; sourceRoot = "${src.name}/${pname}"; @@ -135,6 +135,12 @@ buildPythonPackage rec { "tests/tools/" ]; + disabledTests = [ + # Tests require network access + "test_from_namespaced_persist_dir" + "test_from_persist_dir" + ]; + meta = with lib; { description = "Data framework for your LLM applications"; homepage = "https://github.com/run-llama/llama_index/"; diff --git a/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix b/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix index 466f93653337..76dcdacb5c1e 100644 --- a/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix +++ b/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-embeddings-gemini"; - version = "0.1.8"; + version = "0.2.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_embeddings_gemini"; inherit version; - hash = "sha256-rQKyPqZnyVYH2h5TTVV53kYYldGURWARWjYBrBb4d5M="; + hash = "sha256-7ftu+Gh8Ar9+yrFkUldlAvUfVtAw+xzrmyzqr7TeQdc="; }; pythonRelaxDeps = [ "google-generativeai" ]; diff --git a/pkgs/development/python-modules/llama-index-embeddings-google/default.nix b/pkgs/development/python-modules/llama-index-embeddings-google/default.nix index f848acf1fd42..060b3f562c49 100644 --- a/pkgs/development/python-modules/llama-index-embeddings-google/default.nix +++ b/pkgs/development/python-modules/llama-index-embeddings-google/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-embeddings-google"; - version = "0.1.6"; + version = "0.2.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_embeddings_google"; inherit version; - hash = "sha256-XPqZ+4aZfrTGU4sOLxMElG6kuGVJa8/3uxW+icSHpzQ="; + hash = "sha256-7L24jKB7uFs+4OIIsXdweJ3TRuP4SFjY/p97ocUfmL8="; }; pythonRelaxDeps = [ "google-generativeai" ]; diff --git a/pkgs/development/python-modules/llama-index-embeddings-huggingface/default.nix b/pkgs/development/python-modules/llama-index-embeddings-huggingface/default.nix index 4da4ef2ab654..935590283d85 100644 --- a/pkgs/development/python-modules/llama-index-embeddings-huggingface/default.nix +++ b/pkgs/development/python-modules/llama-index-embeddings-huggingface/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-embeddings-huggingface"; - version = "0.2.2"; + version = "0.3.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_embeddings_huggingface"; inherit version; - hash = "sha256-Q7KXh0DSkpGuTHVmki0rHHVD3JeeJoeUtXjhoq37Qxk="; + hash = "sha256-eu9jJKGVdua5W/6SfDvU/BxXJe3Onya05dLu+ifAL9s="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix b/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix index db3ef8d5b994..e82f1a8c7fdc 100644 --- a/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix +++ b/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix @@ -3,13 +3,14 @@ buildPythonPackage, fetchPypi, llama-index-core, + ollama, poetry-core, pythonOlder, }: buildPythonPackage rec { pname = "llama-index-embeddings-ollama"; - version = "0.1.3"; + version = "0.3.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -17,12 +18,15 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_embeddings_ollama"; inherit version; - hash = "sha256-S9HdMjDJvgTPpFsow6gGbkbBZU1DYPy+zcFxiskBPso="; + hash = "sha256-Q5pc0R473lBPrWqICF6UIX0mp4akY2SBqXBS7MIkB7Y="; }; build-system = [ poetry-core ]; - dependencies = [ llama-index-core ]; + dependencies = [ + llama-index-core + ollama + ]; # Tests are only available in the mono repo doCheck = false; diff --git a/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix b/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix index f6027aee43f8..0df7d65ac5e9 100644 --- a/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "llama-index-embeddings-openai"; - version = "0.1.10"; + version = "0.2.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_embeddings_openai"; inherit version; - hash = "sha256-G8H8m0Z3OhKHDF0wl9NzXXyjOAXxJGKo41ropuXOHPY="; + hash = "sha256-L3re9rYf1PG+pIcWb/ml/wYyJ2hrfbtdIifkZFCn7Ew="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-graph-stores-nebula/default.nix b/pkgs/development/python-modules/llama-index-graph-stores-nebula/default.nix index cd093a05e17c..65be86795ec7 100644 --- a/pkgs/development/python-modules/llama-index-graph-stores-nebula/default.nix +++ b/pkgs/development/python-modules/llama-index-graph-stores-nebula/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-graph-stores-nebula"; - version = "0.2.0"; + version = "0.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_graph_stores_nebula"; inherit version; - hash = "sha256-wX/j4wSUp12QlXLy0B0dUB0V7zjDX75NBE9mNWbj0w8="; + hash = "sha256-yT1jxJEnBKWcsHCgBPx8Ue+wkggdL9S2havmJtSYcD4="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix b/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix index 3700c2bc96ba..e74cb94aa181 100644 --- a/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix +++ b/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-graph-stores-neo4j"; - version = "0.2.11"; + version = "0.3.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_graph_stores_neo4j"; inherit version; - hash = "sha256-nXKpwbE28vq2Ew8Vrw0rxveHBVbu6542wt+aM1t4xl0="; + hash = "sha256-v4rtGi47qyV6cDXfQcKuGrES9IjG/Se5zpnhktuoNHc="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-graph-stores-neptune/default.nix b/pkgs/development/python-modules/llama-index-graph-stores-neptune/default.nix index dbc2bd5238b1..b731a56dcbce 100644 --- a/pkgs/development/python-modules/llama-index-graph-stores-neptune/default.nix +++ b/pkgs/development/python-modules/llama-index-graph-stores-neptune/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-graph-stores-neptune"; - version = "0.1.3"; + version = "0.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_graph_stores_neptune"; inherit version; - hash = "sha256-ZveFCJJT7Qal82cuVTs+3AmSuvdc7GsHqqqNvcDb3CY="; + hash = "sha256-dIbleh/I90xo7rYFXhCck2kfkywAYTlrawlPP0gDqIY="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix b/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix index eeef4efe2ed8..e35110322bb3 100644 --- a/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix +++ b/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-indices-managed-llama-cloud"; - version = "0.2.7"; + version = "0.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_indices_managed_llama_cloud"; inherit version; - hash = "sha256-1+m0zFAhSzz8116mPKzOTuNgkstnLAA/Ff0jujHEnsA="; + hash = "sha256-AqHQtBP/+1UCLn6E4FeIzLGMvc9Uz+wEZthMVlUJ+uY="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-legacy/default.nix b/pkgs/development/python-modules/llama-index-legacy/default.nix index e7c350cdd0a0..f51ae416bb1d 100644 --- a/pkgs/development/python-modules/llama-index-legacy/default.nix +++ b/pkgs/development/python-modules/llama-index-legacy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "llama-index-legacy"; - version = "0.9.48"; + version = "0.9.48.post3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_legacy"; inherit version; - hash = "sha256-gt3EaR7b9JUz1lWCwkm6IsA/6W+9PpL3dY3M7yjkODQ="; + hash = "sha256-9pafEIXvsKvr1jZ+RvNRICDz9rnAhvRYpRmDDdYeggY="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-llms-ollama/default.nix b/pkgs/development/python-modules/llama-index-llms-ollama/default.nix index 998759b62920..010843defbe0 100644 --- a/pkgs/development/python-modules/llama-index-llms-ollama/default.nix +++ b/pkgs/development/python-modules/llama-index-llms-ollama/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-llms-ollama"; - version = "0.2.2"; + version = "0.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_llms_ollama"; inherit version; - hash = "sha256-DH8ZLLi3aHB71RVLl+KkEoRzLWIHDrdhkN7hJelSReo="; + hash = "sha256-nfL+cUwdw6zPc8J81dCEFoLpcCIKMBNNeCXkzvZgsdQ="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-llms-openai-like/default.nix b/pkgs/development/python-modules/llama-index-llms-openai-like/default.nix index 4415127ee30c..fd6b916bec0a 100644 --- a/pkgs/development/python-modules/llama-index-llms-openai-like/default.nix +++ b/pkgs/development/python-modules/llama-index-llms-openai-like/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "llama-index-llms-openai-like"; - version = "0.1.3"; + version = "0.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_llms_openai_like"; inherit version; - hash = "sha256-w0EjJQd8dSY+N9YNUBMUub3HcPEtiisW51bn2ayPnj8="; + hash = "sha256-0E7r8TZadpl557DevF3dXLHLx8oXXyeWABvUPLgx7Nw="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-llms-openai/default.nix b/pkgs/development/python-modules/llama-index-llms-openai/default.nix index 5a10557cc9cc..6e2426aa1807 100644 --- a/pkgs/development/python-modules/llama-index-llms-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-llms-openai/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "llama-index-llms-openai"; - version = "0.1.27"; + version = "0.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_llms_openai"; inherit version; - hash = "sha256-N8LRFZtWYH06gH2QJg7iW08AIIbWJRxycq+8U/JRRgM="; + hash = "sha256-E8hdTPEr0Hueq5gFy8Qt+y410N/J3CZyDt0b3xwRKlQ="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix b/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix index 963f054cd6ef..fd18de972e8a 100644 --- a/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-multi-modal-llms-openai"; - version = "0.1.8"; + version = "0.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_multi_modal_llms_openai"; inherit version; - hash = "sha256-XiyUpkFaJQnK0DXM6jRGGVmuMnpZANPoIEF+nruaE+w="; + hash = "sha256-gRlrcwN0zIjSg/h5Q1fQvWZka5pNqlwJz1dhkDC0aWw="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-program-openai/default.nix b/pkgs/development/python-modules/llama-index-program-openai/default.nix index 781e03a06a44..62b9f6c2527f 100644 --- a/pkgs/development/python-modules/llama-index-program-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-program-openai/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "llama-index-program-openai"; - version = "0.1.7"; + version = "0.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_program_openai"; inherit version; - hash = "sha256-v362GgczgXFL5aBJ2TtABE3+Ub1DM77lOdFTK3QHYh8="; + hash = "sha256-QTmTVUHAESV/v+uWYrO/Eje3Ke9LHI9N31tnidI3SsQ="; }; pythonRelaxDeps = [ "llama-index-agent-openai" ]; diff --git a/pkgs/development/python-modules/llama-index-question-gen-openai/default.nix b/pkgs/development/python-modules/llama-index-question-gen-openai/default.nix index 4633a56770ad..7f7615953bba 100644 --- a/pkgs/development/python-modules/llama-index-question-gen-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-question-gen-openai/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "llama-index-question-gen-openai"; - version = "0.1.3"; + version = "0.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_question_gen_openai"; inherit version; - hash = "sha256-RIYZgRekVFfS4DauYLk69YBSiTzH14+ptvR91HuB4uE="; + hash = "sha256-Pd4c7L1lEABjnCADHX6iMzQnaquxgcrED/Qk814QRl4="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-readers-database/default.nix b/pkgs/development/python-modules/llama-index-readers-database/default.nix index b6c36bbabe85..b77afe7b8dda 100644 --- a/pkgs/development/python-modules/llama-index-readers-database/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-database/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "llama-index-readers-database"; - version = "0.1.4"; + version = "0.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_database"; inherit version; - hash = "sha256-x71+szDNDZNaVc8AMXruKvxSNXg561ibE2+kx53zHfI="; + hash = "sha256-/hI/3lCo0RpJ1yLJDFrnuQ565WoQQm9Sw7Sr4qp1fa0="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-readers-file/default.nix b/pkgs/development/python-modules/llama-index-readers-file/default.nix index ee6c4453e4d5..2154758ae869 100644 --- a/pkgs/development/python-modules/llama-index-readers-file/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-file/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "llama-index-readers-file"; - version = "0.1.27"; + version = "0.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_file"; inherit version; - hash = "sha256-BMm8MGOpQJ/Nh3932bKr/VAuBydjqm3XiODGN0GLhmQ="; + hash = "sha256-Vdt8MWZrqyst0vdi1iLy3I5zkzlDyS+IOIaKkB5QVwg="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/llama-index-readers-json/default.nix b/pkgs/development/python-modules/llama-index-readers-json/default.nix index 6ec922a3a262..0fcc1da35ef2 100644 --- a/pkgs/development/python-modules/llama-index-readers-json/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-json/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "llama-index-readers-json"; - version = "0.1.5"; + version = "0.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_json"; inherit version; - hash = "sha256-H+CG+2FtoOF/DUG6EuAWzY2xe1upLX0pakVutJTZFE0="; + hash = "sha256-Sxya3Iw75sl6mGmKvRMe9Y8bIWh4cfXQPYbCyAvhnvU="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix b/pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix index 877acc82c84d..ca574a141412 100644 --- a/pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-readers-llama-parse"; - version = "0.1.6"; + version = "0.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_llama_parse"; inherit version; - hash = "sha256-BPLc+7D7h85wiQ9aL0+JlB15vmqBi0NzjwU1YOS0Uc8="; + hash = "sha256-xU6KIH1z77nwEWNqMKTBB2tD13o00lY9N03GfAzd/IM="; }; pythonRelaxDeps = [ "llama-parse" ]; diff --git a/pkgs/development/python-modules/llama-index-readers-s3/default.nix b/pkgs/development/python-modules/llama-index-readers-s3/default.nix index 8beec615d8be..3b0f5cb2c0ce 100644 --- a/pkgs/development/python-modules/llama-index-readers-s3/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-s3/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "llama-index-readers-s3"; - version = "0.1.9"; + version = "0.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_s3"; inherit version; - hash = "sha256-ramC3INitu++AHKCWov78ad66/XnZG+Z4bZJHBdN5Uk="; + hash = "sha256-BXld0+j4UpwUFtkjkmfn3CwxMQoCZFj84D4R3Rr2jso="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-readers-twitter/default.nix b/pkgs/development/python-modules/llama-index-readers-twitter/default.nix index 168e3b691757..51bc5d549976 100644 --- a/pkgs/development/python-modules/llama-index-readers-twitter/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-twitter/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-readers-twitter"; - version = "0.1.3"; + version = "0.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_twitter"; inherit version; - hash = "sha256-ZPwluiPdSkwMZ3JQy/HHhR7erYhUE9BWtplkfHk+TK8="; + hash = "sha256-1bxg/tbv5NrMezm9OQUojiQGutv+yhWY4gkeUXb4z2o="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-readers-txtai/default.nix b/pkgs/development/python-modules/llama-index-readers-txtai/default.nix index 0e8e43b4d4d3..6cf4a9fb87f4 100644 --- a/pkgs/development/python-modules/llama-index-readers-txtai/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-txtai/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "llama-index-readers-txtai"; - version = "0.1.2"; + version = "0.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_txtai"; inherit version; - hash = "sha256-F1P3/ZICFDTqowpqu0AF2RIKfLTH9Phuw0O+VsHpI4U="; + hash = "sha256-jaCg3TeMkBKHtZRxpa5KrQb+uGP95qN1nWtrE08Oq98="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-readers-weather/default.nix b/pkgs/development/python-modules/llama-index-readers-weather/default.nix index d3f84bf306f1..1eee073053bd 100644 --- a/pkgs/development/python-modules/llama-index-readers-weather/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-weather/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "llama-index-readers-weather"; - version = "0.1.3"; + version = "0.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_weather"; inherit version; - hash = "sha256-LJy2nU9f+yZZQm9stNn9mIqOkT5lOHaMIIm1Ezf2D0Q="; + hash = "sha256-m4EaV14tcH2I5veHdgGjBloKKAShJqsJGS9Ci8xRnMg="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix index 5af67033af97..6ab0835a135c 100644 --- a/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix +++ b/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-vector-stores-chroma"; - version = "0.1.10"; + version = "0.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_vector_stores_chroma"; inherit version; - hash = "sha256-l5cfezZGHvN74CO5zrVTE5bMSDYNC9vaUczhKQMBzEc="; + hash = "sha256-n6fGNgXB4pbhea1e5QT0Co/sVnd8r3L5+pVCut5U2Uw="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-vector-stores-google/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-google/default.nix index fcf3e0fa9742..aea4617dc992 100644 --- a/pkgs/development/python-modules/llama-index-vector-stores-google/default.nix +++ b/pkgs/development/python-modules/llama-index-vector-stores-google/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-vector-stores-google"; - version = "0.1.5"; + version = "0.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_vector_stores_google"; inherit version; - hash = "sha256-E6RNf2DzktoZW89P0VKfmeZ5SEslGkyFLRxVtnsQOYc="; + hash = "sha256-7BEgRLkhyCo0z3puoWcFRqa+xG6vQdkKFWvr9oz6xs4="; }; pythonRelaxDeps = [ "google-generativeai" ]; diff --git a/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix index a07dd4e6f02d..fb8aa5970f88 100644 --- a/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix +++ b/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "llama-index-vector-stores-postgres"; - version = "0.1.13"; + version = "0.2.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_vector_stores_postgres"; inherit version; - hash = "sha256-aqSSgXb1fmEY98pj8xNQolDLOFbsq/UOXCVZReHYgD4="; + hash = "sha256-xjlFAa3HTJRP/34HaN4fN5BE1VvfAWSLDZnj2s/ES/U="; }; pythonRemoveDeps = [ "psycopg2-binary" ]; diff --git a/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix index 38bf71e35519..b45bfd7c0bd5 100644 --- a/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix +++ b/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "llama-index-vector-stores-qdrant"; - version = "0.2.14"; + version = "0.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_vector_stores_qdrant"; inherit version; - hash = "sha256-+wwwZNQXt2NBSVqYcF5ATiy5K2Cku+Auuhuni7usnKI="; + hash = "sha256-mWY86wyS3aVd+cBhY8pCvn6w86Z0AdWrjOlz987Wg6I="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-parse/default.nix b/pkgs/development/python-modules/llama-parse/default.nix index 051fc5745af2..c248a7cede96 100644 --- a/pkgs/development/python-modules/llama-parse/default.nix +++ b/pkgs/development/python-modules/llama-parse/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "llama-parse"; - version = "0.4.9"; + version = "0.5.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_parse"; inherit version; - hash = "sha256-ZX+PpffTmfFMBFT8BcrmA02gNz8ZHfbPyhehtKcE74c="; + hash = "sha256-IGw0gUeR6WRNrtDaD61QTctrbVK9pUKoe8CB7aknAKA="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/matrix-nio/allow-tests-without-olm.patch b/pkgs/development/python-modules/matrix-nio/allow-tests-without-olm.patch new file mode 100644 index 000000000000..f8ae4015a3f9 --- /dev/null +++ b/pkgs/development/python-modules/matrix-nio/allow-tests-without-olm.patch @@ -0,0 +1,59 @@ +diff --git a/tests/async_client_test.py b/tests/async_client_test.py +index 846c854a32..3a66af2baa 100644 +--- a/tests/async_client_test.py ++++ b/tests/async_client_test.py +@@ -129,7 +129,10 @@ + ) + from nio.api import EventFormat, ResizingMethod, RoomPreset, RoomVisibility + from nio.client.async_client import connect_wrapper, on_request_chunk_sent +-from nio.crypto import OlmDevice, Session, decrypt_attachment ++try: ++ from nio.crypto import OlmDevice, Session, decrypt_attachment ++except ImportError: ++ pass + + TEST_ROOM_ID = "!testroom:example.org" + +diff --git a/tests/conftest.py b/tests/conftest.py +index ae37ca1169..e5f791a31e 100644 +--- a/tests/conftest.py ++++ b/tests/conftest.py +@@ -9,11 +9,17 @@ + async_client_pair, + async_client_pair_same_user, + ) +-from olm import Account ++try: ++ from olm import Account ++except ImportError: ++ pass + + from nio import Client, ClientConfig, HttpClient +-from nio.crypto import Olm, OlmDevice +-from nio.store import SqliteMemoryStore ++try: ++ from nio.crypto import Olm, OlmDevice ++ from nio.store import SqliteMemoryStore ++except ImportError: ++ pass + + ALICE_ID = "@alice:example.org" + ALICE_DEVICE_ID = "JLAFKJWSCS" +diff --git a/tests/helpers.py b/tests/helpers.py +index 63445b605a..05096d1dc3 100644 +--- a/tests/helpers.py ++++ b/tests/helpers.py +@@ -26,8 +26,11 @@ + WindowUpdateFrame, + ) + +-from nio.crypto import OlmAccount, OlmDevice +-from nio.store import Ed25519Key ++try: ++ from nio.crypto import OlmAccount, OlmDevice ++ from nio.store import Ed25519Key ++except ImportError: ++ pass + + SAMPLE_SETTINGS = { + SettingsFrame.HEADER_TABLE_SIZE: 4096, diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix index 6e28fe1cffef..2ddbc6bb58a3 100644 --- a/pkgs/development/python-modules/matrix-nio/default.nix +++ b/pkgs/development/python-modules/matrix-nio/default.nix @@ -38,6 +38,8 @@ pantalaimon, weechatScripts, zulip, + + withOlm ? false, }: buildPythonPackage rec { @@ -52,9 +54,14 @@ buildPythonPackage rec { hash = "sha256-XlswVHLvKOi1qr+I7Mbm4IBjn1DG7glgDsNY48NA5Ew="; }; - nativeBuildInputs = [ poetry-core ]; + patches = [ + # Ignore olm import failures when testing + ./allow-tests-without-olm.patch + ]; - propagatedBuildInputs = [ + build-system = [ poetry-core ]; + + dependencies = [ aiofiles aiohttp aiohttp-socks @@ -63,13 +70,9 @@ buildPythonPackage rec { jsonschema pycryptodome unpaddedbase64 - ]; + ] ++ lib.optionals withOlm optional-dependencies.e2e; - pythonRelaxDeps = [ - "aiohttp-socks" # Pending matrix-nio/matrix-nio#516 - ]; - - passthru.optional-dependencies = { + optional-dependencies = { e2e = [ atomicwrites cachetools @@ -78,6 +81,10 @@ buildPythonPackage rec { ]; }; + pythonRelaxDeps = [ + "aiohttp-socks" # Pending matrix-nio/matrix-nio#516 + ]; + nativeCheckInputs = [ aioresponses faker @@ -87,17 +94,60 @@ buildPythonPackage rec { pytest-aiohttp pytest-benchmark pytestCheckHook - ] ++ passthru.optional-dependencies.e2e; + ]; pytestFlagsArray = [ "--benchmark-disable" ]; - disabledTests = [ - # touches network - "test_connect_wrapper" - # time dependent and flaky - "test_transfer_monitor_callbacks" + disabledTestPaths = lib.optionals (!withOlm) [ + "tests/encryption_test.py" + "tests/key_export_test.py" + "tests/memory_store_test.py" + "tests/sas_test.py" + "tests/sessions_test.py" + "tests/store_test.py" ]; + disabledTests = + [ + # touches network + "test_connect_wrapper" + # time dependent and flaky + "test_transfer_monitor_callbacks" + ] + ++ lib.optionals (!withOlm) [ + "test_client_account_sharing" + "test_client_key_query" + "test_client_login" + "test_client_protocol_error" + "test_client_restore_login" + "test_client_room_creation" + "test_device_store" + "test_e2e_sending" + "test_early_store_loading" + "test_encrypted_data_generator" + "test_http_client_keys_query" + "test_key_claiming" + "test_key_exports" + "test_key_invalidation" + "test_key_sharing" + "test_key_sharing_callbacks" + "test_key_sharing_cancellation" + "test_keys_query" + "test_keys_upload" + "test_marking_sessions_as_shared" + "test_message_sending" + "test_query_rule" + "test_room_devices" + "test_sas_verification" + "test_sas_verification_cancel" + "test_session_sharing" + "test_session_sharing_2" + "test_session_unwedging" + "test_storing_room_encryption_state" + "test_sync_forever" + "test_sync_token_restoring" + ]; + passthru.tests = { inherit (nixosTests) dendrite diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix index 9895f6417184..1746fa01dbe9 100644 --- a/pkgs/development/python-modules/mautrix/default.nix +++ b/pkgs/development/python-modules/mautrix/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, pythonOlder, # deps + setuptools, aiohttp, attrs, yarl, @@ -18,12 +19,14 @@ aiosqlite, asyncpg, ruamel-yaml, + + withOlm ? false, }: buildPythonPackage rec { pname = "mautrix"; version = "0.20.6"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.10"; @@ -34,13 +37,15 @@ buildPythonPackage rec { hash = "sha256-g6y2u3ipSp5HoakHqd/ryPlyA+kR7zO6uY4AqfqbwiE="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ aiohttp attrs yarl - ]; + ] ++ lib.optionals withOlm optional-dependencies.encryption; - passthru.optional-dependencies = { + optional-dependencies = { detect_mimetype = [ python-magic ]; encryption = [ python-olm @@ -55,7 +60,9 @@ buildPythonPackage rec { aiosqlite asyncpg ruamel-yaml - ] ++ passthru.optional-dependencies.encryption; + ]; + + disabledTestPaths = lib.optionals (!withOlm) [ "mautrix/crypto/" ]; pythonImportsCheck = [ "mautrix" ]; diff --git a/pkgs/development/python-modules/mdformat-gfm-alerts/default.nix b/pkgs/development/python-modules/mdformat-gfm-alerts/default.nix new file mode 100644 index 000000000000..097e2b912cf8 --- /dev/null +++ b/pkgs/development/python-modules/mdformat-gfm-alerts/default.nix @@ -0,0 +1,41 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + flit-core, + mdformat, + mdit-py-plugins, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "mdformat-gfm-alerts"; + version = "1.0.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "KyleKing"; + repo = "mdformat-gfm-alerts"; + rev = "refs/tags/v${version}"; + hash = "sha256-2EYdNCyS1LxcEnCXkOugAAGx5XLWV4cWTNkXjR8RVQo="; + }; + + build-system = [ flit-core ]; + + dependencies = [ + mdformat + mdit-py-plugins + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "mdformat_gfm_alerts" ]; + + meta = { + description = "Format 'GitHub Markdown Alerts', which use blockquotes to render admonitions"; + homepage = "https://github.com/KyleKing/mdformat-gfm-alerts"; + changelog = "https://github.com/KyleKing/mdformat-gfm-alerts/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sigmanificient ]; + }; +} diff --git a/pkgs/development/python-modules/mitmproxy/default.nix b/pkgs/development/python-modules/mitmproxy/default.nix index b50216ece8ad..2c4d1da6e629 100644 --- a/pkgs/development/python-modules/mitmproxy/default.nix +++ b/pkgs/development/python-modules/mitmproxy/default.nix @@ -59,6 +59,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ + "protobuf" "urwid" ]; diff --git a/pkgs/development/python-modules/os-client-config/default.nix b/pkgs/development/python-modules/os-client-config/default.nix new file mode 100644 index 000000000000..e06fa9be9f4b --- /dev/null +++ b/pkgs/development/python-modules/os-client-config/default.nix @@ -0,0 +1,62 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + fixtures, + hacking, + jsonschema, + openstacksdk, + oslotest, + python-glanceclient, + setuptools, + stestr, + subunit, + testscenarios, + testtools, +}: + +buildPythonPackage rec { + pname = "os-client-config"; + version = "2.1.0"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-q8OKNR+MAG009+5fP2SN5ePs9kVcxdds/YidKRzfP04="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + openstacksdk + python-glanceclient + ]; + + nativeCheckInputs = [ + hacking + fixtures + jsonschema + subunit + oslotest + stestr + testscenarios + testtools + ]; + + checkPhase = '' + runHook preCheck + + stestr run + + runHook postCheck + ''; + + pythonImportsCheck = [ "os_client_config" ]; + + meta = with lib; { + homepage = "https://opendev.org/openstack/os-client-config"; + description = "Collect client configuration for using OpenStack in consistent and comprehensive manner"; + license = licenses.asl20; + maintainers = teams.openstack.members; + }; +} diff --git a/pkgs/development/python-modules/osprofiler/default.nix b/pkgs/development/python-modules/osprofiler/default.nix new file mode 100644 index 000000000000..546d7e5fedf6 --- /dev/null +++ b/pkgs/development/python-modules/osprofiler/default.nix @@ -0,0 +1,51 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + netaddr, + oslo-concurrency, + oslo-serialization, + oslo-utils, + prettytable, + requests, + setuptools, + webob, +}: + +buildPythonPackage rec { + pname = "osprofiler"; + version = "4.1.0"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-V4N7YgWBsTREouIFZHddT8c+/2fHiIr5mUftWC/lFLA="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + netaddr + oslo-concurrency + oslo-serialization + oslo-utils + prettytable + requests + webob + ]; + + # NOTE(vinetos): OSProfiler depends on jeager-client which use opentracing + # Opentracing and jeager-client are archived since 2022. + # As this package is made only to support old OpenStack clients and bindings, + # We do not really care + doCheck = false; + + pythonImportsCheck = [ "osprofiler" ]; + + meta = with lib; { + description = "OpenStack Library to profile request between all involved services"; + homepage = "https://opendev.org/openstack/osprofiler/"; + license = licenses.asl20; + maintainers = teams.openstack.members; + }; +} diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index 7fddf000ddb3..3a411be77e09 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -1,28 +1,23 @@ { lib, aiohttp, - async-timeout, buildPythonPackage, - crcmod, defusedxml, fetchFromGitHub, freezegun, jsonpickle, munch, - pyserial, pytest-aiohttp, pytest-asyncio, pytestCheckHook, python-dateutil, pythonOlder, - semver, setuptools, - wheel, }: buildPythonPackage rec { pname = "plugwise"; - version = "1.1.0"; + version = "1.2.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -31,30 +26,21 @@ buildPythonPackage rec { owner = "plugwise"; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - hash = "sha256-IaLXCuope/6shF3HmKAo7IrXxVJLzAQzsqlx0dASllk="; + hash = "sha256-I9GCFPgTSHquRxvXS0R22q7lxdhKRC76kALIx4hFAAM="; }; postPatch = '' - # setuptools - sed -i -e "s/~=[0-9.]*//" pyproject.toml - # wheel - sed -i -e "s/~=[0-9.]*//" pyproject.toml + # setuptools and wheel + sed -i -e "s/~=[0-9.]*//g" pyproject.toml ''; - build-system = [ - setuptools - wheel - ]; + build-system = [ setuptools ]; dependencies = [ aiohttp - async-timeout - crcmod defusedxml munch - pyserial python-dateutil - semver ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix index 75dc81ccbad3..049833dc1b09 100644 --- a/pkgs/development/python-modules/protobuf/default.nix +++ b/pkgs/development/python-modules/protobuf/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "protobuf"; - version = "5.27.2"; + version = "5.28.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-8+ze8ia5r4VgdfKCJ/8skM46WU0JLDm+5VE1c/JeJxQ="; + hash = "sha256-3edK8Pp3T6mIkiCZkila2/uR2j+pjI9nqIr+j1o0mt0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/python-neutronclient/default.nix b/pkgs/development/python-modules/python-neutronclient/default.nix new file mode 100644 index 000000000000..0c68f8c086db --- /dev/null +++ b/pkgs/development/python-modules/python-neutronclient/default.nix @@ -0,0 +1,98 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + # Build and Runtime + pbr, + cliff, + debtcollector, + iso8601, + netaddr, + openstacksdk, + osc-lib, + oslo-i18n, + oslo-log, + oslo-serialization, + oslo-utils, + os-client-config, + keystoneauth1, + python-keystoneclient, + requests, + hacking, + # Tests + fixtures, + oslotest, + osprofiler, + python-openstackclient, + subunit, + requests-mock, + stestr, + testtools, + testscenarios, + tempest, +}: + +buildPythonPackage rec { + pname = "python-neutronclient"; + version = "11.3.1"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-U82ZI/Q6OwdypA41YfdGVa3IA4+QJhqz3gW2IR0S7cs="; + }; + + build-system = [ + setuptools + pbr + ]; + + dependencies = [ + cliff + debtcollector + iso8601 + netaddr + openstacksdk + osc-lib + oslo-i18n + oslo-log + oslo-serialization + oslo-utils + os-client-config + keystoneauth1 + python-keystoneclient + requests + ]; + + nativeCheckInputs = [ + hacking + fixtures + oslotest + osprofiler + python-openstackclient + subunit + requests-mock + stestr + testtools + testscenarios + tempest + ]; + + checkPhase = '' + runHook preCheck + + stestr run + + runHook postCheck + ''; + + pythonImportsCheck = [ "neutronclient" ]; + + meta = with lib; { + description = "Python bindings for the OpenStack Networking API"; + homepage = "https://opendev.org/openstack/python-neutronclient/"; + license = licenses.asl20; + maintainers = teams.openstack.members; + }; +} diff --git a/pkgs/development/python-modules/python-octaviaclient/default.nix b/pkgs/development/python-modules/python-octaviaclient/default.nix new file mode 100644 index 000000000000..7b9017618e8f --- /dev/null +++ b/pkgs/development/python-modules/python-octaviaclient/default.nix @@ -0,0 +1,89 @@ +{ + lib, + buildPythonPackage, + cliff, + doc8, + docutils, + fetchPypi, + hacking, + keystoneauth1, + openstackclient, + openstackdocstheme, + osc-lib, + oslotest, + oslo-serialization, + oslo-utils, + pbr, + pygments, + python-neutronclient, + requests, + requests-mock, + setuptools, + sphinx, + sphinxcontrib-apidoc, + stestr, + subunit, + testscenarios, +}: + +buildPythonPackage rec { + pname = "python-octaviaclient"; + version = "3.7.0"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-wAGxByeRBOwdWZg2DwVpt1yGi5er3KQ/qhyRVAwaKe4="; + }; + + build-system = [ + setuptools + pbr + ]; + + nativeBuildInputs = [ + openstackdocstheme + sphinx + sphinxcontrib-apidoc + ]; + + dependencies = [ + cliff + keystoneauth1 + python-neutronclient + openstackclient + osc-lib + oslo-serialization + oslo-utils + requests + ]; + + nativeCheckInputs = [ + hacking + requests-mock + doc8 + docutils + pygments + subunit + oslotest + stestr + testscenarios + ]; + + checkPhase = '' + runHook preCheck + + stestr run + + runHook postCheck + ''; + + pythonImportsCheck = [ "octaviaclient" ]; + + meta = with lib; { + description = "OpenStack Octavia Command-line Client"; + homepage = "https://opendev.org/openstack/python-octaviaclient/"; + license = licenses.asl20; + maintainers = teams.openstack.members; + }; +} diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix index 114b2aae444b..f78874f9124b 100644 --- a/pkgs/development/python-modules/python-openstackclient/default.nix +++ b/pkgs/development/python-modules/python-openstackclient/default.nix @@ -13,6 +13,7 @@ python-ironicclient, python-keystoneclient, python-manilaclient, + python-neutronclient, python-openstackclient, requests-mock, requests, @@ -73,6 +74,7 @@ buildPythonPackage rec { python-heatclient python-ironicclient python-manilaclient + python-neutronclient ]; }; tests.version = testers.testVersion { diff --git a/pkgs/development/python-modules/raylib-python-cffi/default.nix b/pkgs/development/python-modules/raylib-python-cffi/default.nix index f1d46c1822d1..e77e357b3f3a 100644 --- a/pkgs/development/python-modules/raylib-python-cffi/default.nix +++ b/pkgs/development/python-modules/raylib-python-cffi/default.nix @@ -1,4 +1,6 @@ { + stdenv, + gcc, buildPythonPackage, fetchFromGitHub, setuptools, @@ -9,9 +11,19 @@ raylib, physac, raygui, - lib + darwin, + lib, }: +let + inherit (darwin.apple_sdk.frameworks) + OpenGL + Cocoa + IOKit + CoreFoundation + CoreVideo + ; +in buildPythonPackage rec { pname = "raylib-python-cffi"; version = "5.0.0.2"; @@ -31,22 +43,36 @@ buildPythonPackage rec { # This patch fixes to the builder script function to call pkg-config # using the library name rather than searching only through raylib ./fix_pyray_builder.patch + + # use get_lib_flags() instead of linking to libraylib.a directly + ./fix_macos_raylib.patch ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + gcc + ]; # tests require a graphic environment doCheck = false; pythonImportsCheck = [ "pyray" ]; - buildInputs = [ - glfw - libffi - raylib - physac - raygui - ]; + buildInputs = + [ + glfw + libffi + raylib + physac + raygui + ] + ++ lib.optionals stdenv.isDarwin [ + OpenGL + Cocoa + IOKit + CoreFoundation + CoreVideo + ]; meta = { description = "Python CFFI bindings for Raylib"; diff --git a/pkgs/development/python-modules/raylib-python-cffi/fix_macos_raylib.patch b/pkgs/development/python-modules/raylib-python-cffi/fix_macos_raylib.patch new file mode 100644 index 000000000000..be2f41a3720c --- /dev/null +++ b/pkgs/development/python-modules/raylib-python-cffi/fix_macos_raylib.patch @@ -0,0 +1,11 @@ +--- a/raylib/build.py ++++ b/raylib/build.py +@@ -158,7 +158,7 @@ def build_unix(): + + if platform.system() == "Darwin": + print("BUILDING FOR MAC") +- extra_link_args = [get_the_lib_path() + '/libraylib.a', '-framework', 'OpenGL', '-framework', 'Cocoa', ++ extra_link_args = get_lib_flags() + ['-framework', 'OpenGL', '-framework', 'Cocoa', + '-framework', 'IOKit', '-framework', 'CoreFoundation', '-framework', + 'CoreVideo'] + libraries = [] diff --git a/pkgs/development/python-modules/rdkit/default.nix b/pkgs/development/python-modules/rdkit/default.nix index 44096b6910c0..248f212f0abe 100644 --- a/pkgs/development/python-modules/rdkit/default.nix +++ b/pkgs/development/python-modules/rdkit/default.nix @@ -100,10 +100,10 @@ buildPythonPackage rec { preConfigure = '' # Since we can't expand with bash in cmakeFlags - cmakeFlags="$cmakeFlags -DPYTHON_NUMPY_INCLUDE_PATH=$(${python}/bin/python -c 'import numpy; print(numpy.get_include())')" - cmakeFlags="$cmakeFlags -DFREESASA_DIR=$PWD/External/FreeSASA/freesasa" - cmakeFlags="$cmakeFlags -DFREESASA_SRC_DIR=$PWD/External/FreeSASA/freesasa" - cmakeFlags="$cmakeFlags -DAVALONTOOLS_DIR=$PWD/External/AvalonTools/avalon" + appendToVar cmakeFlags "-DPYTHON_NUMPY_INCLUDE_PATH=$(${python}/bin/python -c 'import numpy; print(numpy.get_include())')" + appendToVar cmakeFlags "-DFREESASA_DIR=$PWD/External/FreeSASA/freesasa" + appendToVar cmakeFlags "-DFREESASA_SRC_DIR=$PWD/External/FreeSASA/freesasa" + appendToVar cmakeFlags "-DAVALONTOOLS_DIR=$PWD/External/AvalonTools/avalon" ''; cmakeFlags = [ diff --git a/pkgs/games/cataclysm-dda/git.nix b/pkgs/games/cataclysm-dda/git.nix index e577d1aa710f..495d5f97fb09 100644 --- a/pkgs/games/cataclysm-dda/git.nix +++ b/pkgs/games/cataclysm-dda/git.nix @@ -2,9 +2,9 @@ , tiles ? true, Cocoa , debug ? false , useXdgDir ? false -, version ? "2022-08-20" -, rev ? "f65b2bc4c6dea24bd9a993b8df146e5698e7e36f" -, sha256 ? "sha256-00Tp9OmsM39PYwAJXKKRS9zmn7KsGQ9s1eVmEqghkpw=" +, version ? "2024-07-28" +, rev ? "bfeb1fffc4179fed242a042f24b1c97f6cfaff3d" +, sha256 ? "sha256-IodXEA+pWfDdR9huRXieP3+J3WZJO19C8PUPT18dFBw=" }: let @@ -24,20 +24,7 @@ let patches = [ # Unconditionally look for translation files in $out/share/locale - ./locale-path.patch - # Fixes for failing build with GCC 13, remove on updating next release after 0.G - (fetchpatch { - url = "https://sources.debian.org/data/main/c/cataclysm-dda/0.G-4/debian/patches/gcc13-dangling-reference-warning.patch"; - hash = "sha256-9nPbyz49IYBOVHqr7jzCIyS8z/SQgpK4EjEz1fruIPE="; - }) - (fetchpatch { - url = "https://sources.debian.org/data/main/c/cataclysm-dda/0.G-4/debian/patches/gcc13-cstdint.patch"; - hash = "sha256-8IBW2OzAHVgEJZoViQ490n37sl31hA55ePuqDL/lil0="; - }) - (fetchpatch { - url = "https://sources.debian.org/data/main/c/cataclysm-dda/0.G-4/debian/patches/gcc13-keyword-requires.patch"; - hash = "sha256-8yvHh0YKC7AC/qzia7AZAfMewMC0RiSepMXpOkMXRd8="; - }) + ./locale-path-git.patch ]; makeFlags = common.makeFlags ++ [ diff --git a/pkgs/games/cataclysm-dda/locale-path-git.patch b/pkgs/games/cataclysm-dda/locale-path-git.patch new file mode 100644 index 000000000000..8f18b0ffb71e --- /dev/null +++ b/pkgs/games/cataclysm-dda/locale-path-git.patch @@ -0,0 +1,17 @@ +diff --git a/src/translations.cpp b/src/translations.cpp +--- a/src/translations.cpp ++++ b/src/translations.cpp +@@ -52,13 +52,11 @@ std::string locale_dir() + #define CATA_IS_ON_BSD + #endif + +-#if !defined(__ANDROID__) && ((defined(__linux__) || defined(CATA_IS_ON_BSD) || (defined(MACOSX) && !defined(TILES)))) + if( !PATH_INFO::base_path().empty() ) { + loc_dir = PATH_INFO::base_path() + "share/locale"; + } else { + loc_dir = PATH_INFO::langdir(); + } +-#endif + #endif // LOCALIZE + return loc_dir; + } diff --git a/pkgs/games/chiaki4deck/default.nix b/pkgs/games/chiaki-ng/default.nix similarity index 86% rename from pkgs/games/chiaki4deck/default.nix rename to pkgs/games/chiaki-ng/default.nix index 509fa9eccb22..cc183cb7c1da 100644 --- a/pkgs/games/chiaki4deck/default.nix +++ b/pkgs/games/chiaki-ng/default.nix @@ -1,6 +1,5 @@ { lib , fetchFromGitHub -, fetchpatch2 , stdenv , cmake , pkg-config @@ -35,14 +34,14 @@ }: stdenv.mkDerivation rec { - pname = "chiaki4deck"; - version = "1.7.4"; + pname = "chiaki-ng"; + version = "1.8.1"; src = fetchFromGitHub { owner = "streetpea"; - repo = pname; + repo = "chiaki-ng"; rev = "v${version}"; - hash = "sha256-9EF+Mm6nZeo3XYH8KO7e22cJ4e9TWUEinhkm+Z213RU="; + hash = "sha256-wYshjduufxTxLzU2462ZRCj9WP/PZoJUOC/kGzus8ew="; fetchSubmodules = true; }; @@ -113,8 +112,8 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://streetpea.github.io/chiaki4deck/"; - description = "Fork of Chiaki (Open Source Playstation Remote Play) with Enhancements for Steam Deck"; + homepage = "https://streetpea.github.io/chiaki-ng/"; + description = "Next-Generation of Chiaki (the open-source remote play client for PlayStation)"; # Includes OpenSSL linking exception that we currently have no way # to represent. # diff --git a/pkgs/games/commandergenius/default.nix b/pkgs/games/commandergenius/default.nix index 568dcc7e51e1..d3549fd211f2 100644 --- a/pkgs/games/commandergenius/default.nix +++ b/pkgs/games/commandergenius/default.nix @@ -28,10 +28,14 @@ stdenv.mkDerivation rec { buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_ttf libGL boost libvorbis zlib curl python3 ]; - preConfigure = '' - export cmakeFlags="$cmakeFlags -DCMAKE_INSTALL_PREFIX=$out -DSHAREDIR=$out/share" - export makeFlags="$makeFlags DESTDIR=$(out)" - ''; + cmakeFlags = [ + "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}" + "-DSHAREDIR=${placeholder "out"}/share" + ]; + + makeFlags = [ + "DESTDIR=${placeholder "out"}" + ]; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/kde/gear/kongress/default.nix b/pkgs/kde/gear/kongress/default.nix index 8ac8807eb68e..e91c9cf59069 100644 --- a/pkgs/kde/gear/kongress/default.nix +++ b/pkgs/kde/gear/kongress/default.nix @@ -1,9 +1,11 @@ { mkKdeDerivation, + kcontacts, + qtlocation, qtsvg, }: mkKdeDerivation { pname = "kongress"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [kcontacts qtsvg qtlocation]; } diff --git a/pkgs/misc/logging/pacemaker/default.nix b/pkgs/misc/logging/pacemaker/default.nix index 87ab12ee29c8..e0d20dfcb46c 100644 --- a/pkgs/misc/logging/pacemaker/default.nix +++ b/pkgs/misc/logging/pacemaker/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "pacemaker"; - version = "2.1.7"; + version = "2.1.8"; src = fetchFromGitHub { owner = "ClusterLabs"; repo = pname; rev = "Pacemaker-${version}"; - sha256 = "sha256-cvCMIzeyP9oEzHpafOvCORYwWg6cH5qj3qXOUMW4nHA="; + sha256 = "sha256-J57+NSs4cL3BlEjSaXAoUTEhbMMxhWy8sUZ/K3x2nRM="; }; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index f68ef004e4d1..7cd3f146a96f 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -1,7 +1,7 @@ { "testing": { - "version": "6.11-rc5", - "hash": "sha256:06qq6y7cryq0xy4b68ky2hr44cw2nqhbna0dbzfbmr9d5sh9c0gn" + "version": "6.11-rc6", + "hash": "sha256:15lx6da4kdsipxlv7my8wamss5i001r4cc2ab1icvw1ms207b5in" }, "6.1": { "version": "6.1.107", diff --git a/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix b/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix index df92857c2543..dad37ccef616 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "6.1.105-rt38"; # updated by ./update-rt.sh + version = "6.1.107-rt39"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -19,14 +19,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz"; - sha256 = "162yz32jqd2xkswsd1jxmjq4yhzmhzn17snicad35x51k3vaigr3"; + sha256 = "1s5h51r41l0d3k1h9i4mya7nz53jd6i200s06w5gl49hsz8jjcpl"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0mk9xz1llzfib0g68b7d1ni5qyj899ldz6n1x1him0ngrqqb0y97"; + sha256 = "0pgamrlbzxwrnvp75xs6h838y5zvlys11pxx23clbgj9gmaqkvax"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix b/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix index dbbe62e673b2..2978a49219f9 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "6.6.44-rt39"; # updated by ./update-rt.sh + version = "6.6.48-rt40"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -19,14 +19,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz"; - sha256 = "1n6ckxx0i4dbq018b56q1wkwq944jhjy225swrpn65a9jfb848ck"; + sha256 = "0a90fx0r25nkcr5b16dn1j7vwyndnshaxn6ziyviccds59xxy5kb"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0c6a75b33xyzwp779j35xyz9gp9njmqvg84425yrnmykdl5fwfqh"; + sha256 = "1i5jzz7yq13d6ia6n0lb2bxi8bzhq775z2acg0mddzy2a092g102"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/pkgs/servers/mautrix-facebook/default.nix b/pkgs/servers/mautrix-facebook/default.nix index cb7897853b52..3857e5abd45d 100644 --- a/pkgs/servers/mautrix-facebook/default.nix +++ b/pkgs/servers/mautrix-facebook/default.nix @@ -21,7 +21,7 @@ python3.pkgs.buildPythonPackage rec { aiohttp asyncpg commonmark - mautrix + (mautrix.override { withOlm = true; }) paho-mqtt pillow prometheus-client diff --git a/pkgs/servers/mautrix-googlechat/default.nix b/pkgs/servers/mautrix-googlechat/default.nix index e0f5bc80b8f1..8f8bef86ab2b 100644 --- a/pkgs/servers/mautrix-googlechat/default.nix +++ b/pkgs/servers/mautrix-googlechat/default.nix @@ -55,7 +55,7 @@ commonmark python-magic protobuf - mautrix + (mautrix.override { withOlm = enableE2be; }) ] ++ lib.optionals enableE2be passthru.optional-dependencies.e2be ++ lib.optionals enableMetrics passthru.optional-dependencies.metrics ++ lib.optionals enableSqlite passthru.optional-dependencies.sqlite; diff --git a/pkgs/servers/mautrix-signal/default.nix b/pkgs/servers/mautrix-signal/default.nix index 309f7df1a62b..08894b5492f6 100644 --- a/pkgs/servers/mautrix-signal/default.nix +++ b/pkgs/servers/mautrix-signal/default.nix @@ -1,4 +1,16 @@ -{ lib, buildGoModule, fetchFromGitHub, olm, libsignal-ffi }: +{ + lib, + buildGoModule, + fetchFromGitHub, + olm, + libsignal-ffi, + # This option enables the use of an experimental pure-Go implementation of + # the Olm protocol instead of libolm for end-to-end encryption. Using goolm + # is not recommended by the mautrix developers, but they are interested in + # people trying it out in non-production-critical environments and reporting + # any issues they run into. + withGoolm ? false, +}: buildGoModule rec { pname = "mautrix-signal"; @@ -11,12 +23,12 @@ buildGoModule rec { hash = "sha256-KBb/rLYM2ne4VD/bPy/lcXD0avCx3J74e3zDcmg+Dzs="; }; - buildInputs = [ - olm + buildInputs = (lib.optional (!withGoolm) olm) ++ [ # must match the version used in https://github.com/mautrix/signal/tree/main/pkg/libsignalgo # see https://github.com/mautrix/signal/issues/401 libsignal-ffi ]; + tags = lib.optional withGoolm "goolm"; vendorHash = "sha256-DDcz4O3RhV6OVI+qC/LkDW/UsE5jOAn5t/gmILxHx1s="; diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix index 4e9d00a9534b..53bdb18c22ae 100644 --- a/pkgs/servers/mautrix-telegram/default.nix +++ b/pkgs/servers/mautrix-telegram/default.nix @@ -43,7 +43,7 @@ python.pkgs.buildPythonPackage rec { commonmark aiohttp yarl - mautrix + (mautrix.override { withOlm = withE2BE; }) tulir-telethon asyncpg mako diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index d7bad1c9c79b..b66dad00dad5 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -1,4 +1,15 @@ -{ lib, buildGoModule, fetchFromGitHub, olm }: +{ + lib, + buildGoModule, + fetchFromGitHub, + olm, + # This option enables the use of an experimental pure-Go implementation of + # the Olm protocol instead of libolm for end-to-end encryption. Using goolm + # is not recommended by the mautrix developers, but they are interested in + # people trying it out in non-production-critical environments and reporting + # any issues they run into. + withGoolm ? false, +}: buildGoModule rec { pname = "mautrix-whatsapp"; @@ -11,7 +22,8 @@ buildGoModule rec { hash = "sha256-iVILI6OGndnxIVmgNcIwHA64tkv9V3OTH3YtrCyeYx4="; }; - buildInputs = [ olm ]; + buildInputs = lib.optional (!withGoolm) olm; + tags = lib.optional withGoolm "goolm"; vendorHash = "sha256-DpgkSXSLF+U6zIzJ4AF2uTcFWQQYsRgkaUTG9F+bnVk="; diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix index 5d46addfc963..d10c614828c7 100644 --- a/pkgs/servers/monitoring/nagios/default.nix +++ b/pkgs/servers/monitoring/nagios/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nagios"; - version = "4.5.3"; + version = "4.5.4"; src = fetchFromGitHub { owner = "NagiosEnterprises"; repo = "nagioscore"; rev = "refs/tags/nagios-${finalAttrs.version}"; - hash = "sha256-irr6JVCE3krcD3kScGR8maSbvsNPeQFqWm5oNl9OhQU="; + hash = "sha256-QZKSVjaOUDmsQwOlJSTQgy8BuTZ5tcDaJB0a6KttrdU="; }; patches = [ ./nagios.patch ]; diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix index ce4a75cea75b..b0f1ca4f6a3d 100644 --- a/pkgs/servers/monitoring/thanos/default.nix +++ b/pkgs/servers/monitoring/thanos/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "thanos"; - version = "0.35.1"; + version = "0.36.1"; src = fetchFromGitHub { owner = "thanos-io"; repo = "thanos"; rev = "refs/tags/v${version}"; - hash = "sha256-XSQMFtMZvcUcOFi14EZiyq65GdPbzOqUVqFM0FLSj3E="; + hash = "sha256-Zcc860kQkVP1DPyadBoalhcvwh5HF9CgQyjzWRdeXt0="; }; - vendorHash = "sha256-i8EGUxNbxfyPQ3BVa7yBR1ygHIC64v6m/aDGFzWWfIE="; + vendorHash = "sha256-d+jHGmCfx9Ffm5pajm1RvKnMea99JswL0I8nmILXN50="; doCheck = true; diff --git a/pkgs/servers/nfs-ganesha/default.nix b/pkgs/servers/nfs-ganesha/default.nix index c5d3d97d629f..ad9d880b8540 100644 --- a/pkgs/servers/nfs-ganesha/default.nix +++ b/pkgs/servers/nfs-ganesha/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "nfs-ganesha"; - version = "5.9"; + version = "6.0"; outputs = [ "out" "tools" ]; src = fetchFromGitHub { owner = "nfs-ganesha"; repo = "nfs-ganesha"; rev = "V${version}"; - sha256 = "sha256-YFQcqRZenJUdTnlYM7gPnIxU47dytSHk5ALdbpSf5Ms="; + sha256 = "sha256-tT8m4X2OgANreTljqAYcCN0HTu++boFBmzyha7XGo8Y="; }; preConfigure = "cd src"; diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix index 43ed4e175ede..896e8b3d1f1a 100644 --- a/pkgs/servers/radarr/default.nix +++ b/pkgs/servers/radarr/default.nix @@ -10,15 +10,15 @@ let }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-2UkdzOvJZ7fWag/kyfFffPtCVEXil0TTcTReykPKWuU="; - arm64-linux_hash = "sha256-IuLtPWsUukiIk9H/0yf74SipYcbvn1p5MZUbptypCJs="; - x64-osx_hash = "sha256-vLkY9rqdQwr/ntpmUMK5bCIjLWGCt1xEhH/QQzgkZV8="; - arm64-osx_hash = "sha256-Y0aXaMnOCdzrIiM7BqGdHAIO60VFNWUb5ISGaVDX/9s="; + x64-linux_hash = "sha256-byYFQ3QJVElVNSxYWOx0EWbreDKgFcaQFkXNkWt3TP8="; + arm64-linux_hash = "sha256-ekt8Kl3RL+bBoeehpCWH7qD4Zt+ni9WAOsI9Zw4ZVi0="; + x64-osx_hash = "sha256-0VtDl6jPsT25KV9uEvn/bDxOIouRXK32YFPv/ZBK4Qc="; + arm64-osx_hash = "sha256-8N9X4UYewouD16B/WOhIL1m8R6C7cdptDQQZIutLzXU="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "radarr"; - version = "5.8.3.8933"; + version = "5.9.1.9070"; src = fetchurl { url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.master.${version}.${os}-core-${arch}.tar.gz"; diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix index 646379e3e641..db49d376c62d 100644 --- a/pkgs/servers/roundcube/default.nix +++ b/pkgs/servers/roundcube/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "roundcube"; - version = "1.6.8"; + version = "1.6.9"; src = fetchurl { url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz"; - sha256 = "sha256-hGi+AgSnNMV0re9L4BV4x9xPq5wv40ADvzQaK9IO/So="; + sha256 = "sha256-thpfXCL4kMKZ6TWqz88IcGdpkNiuv/DWzf8HW/F8708="; }; patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ]; diff --git a/pkgs/tools/bluetooth/blueberry/default.nix b/pkgs/tools/bluetooth/blueberry/default.nix index 4b4786ac9a0d..4bc7736e06ed 100644 --- a/pkgs/tools/bluetooth/blueberry/default.nix +++ b/pkgs/tools/bluetooth/blueberry/default.nix @@ -2,7 +2,7 @@ , lib , fetchFromGitHub , bluez-tools -, gnome +, gnome-bluetooth_1_0 , gobject-introspection , libnotify , pavucontrol @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = [ bluez-tools - gnome.gnome-bluetooth_1_0 + gnome-bluetooth_1_0 libnotify python3Packages.python util-linux diff --git a/pkgs/tools/filesystems/irods/common.nix b/pkgs/tools/filesystems/irods/common.nix index 33edc0e4a05b..c2e09220a957 100644 --- a/pkgs/tools/filesystems/irods/common.nix +++ b/pkgs/tools/filesystems/irods/common.nix @@ -27,15 +27,13 @@ "-DCPACK_GENERATOR=TGZ" "-DCMAKE_CXX_FLAGS=-I${lib.getDev libcxx}/include/c++/v1" "-DPAM_LIBRARY=${pam}/lib/libpam.so" + "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}" + "-DIRODS_HOME_DIRECTORY=${placeholder "out"}" + "-DCMAKE_INSTALL_SBINDIR=${placeholder "out"}/sbin" ]; postPatch = '' patchShebangs ./packaging ./scripts - export cmakeFlags="$cmakeFlags - -DCMAKE_INSTALL_PREFIX=$out - -DIRODS_HOME_DIRECTORY=$out - -DCMAKE_INSTALL_SBINDIR=$out/sbin - " ''; meta = with lib; { diff --git a/pkgs/tools/filesystems/irods/default.nix b/pkgs/tools/filesystems/irods/default.nix index 5db0ed453eab..beddb6959ba4 100644 --- a/pkgs/tools/filesystems/irods/default.nix +++ b/pkgs/tools/filesystems/irods/default.nix @@ -32,6 +32,12 @@ rec { # fix build with recent llvm versions env.NIX_CFLAGS_COMPILE = "-Wno-deprecated-register -Wno-deprecated-declarations"; + cmakeFlags = common.cmakeFlags or [ ] ++ [ + "-DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath,${placeholder "out"}/lib" + "-DCMAKE_MODULE_LINKER_FLAGS=-Wl,-rpath,${placeholder "out"}/lib" + "-DCMAKE_SHARED_LINKER_FLAGS=-Wl,-rpath,${placeholder "out"}/lib" + ]; + postPatch = common.postPatch + '' patchShebangs ./test substituteInPlace plugins/database/CMakeLists.txt --replace-fail "COMMAND cpp" "COMMAND ${gcc.cc}/bin/cpp" @@ -39,11 +45,6 @@ rec { do substituteInPlace $file --replace-quiet "CATCH2}/include" "CATCH2}/include/catch2" done - export cmakeFlags="$cmakeFlags - -DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath,$out/lib - -DCMAKE_MODULE_LINKER_FLAGS=-Wl,-rpath,$out/lib - -DCMAKE_SHARED_LINKER_FLAGS=-Wl,-rpath,$out/lib - " substituteInPlace server/auth/CMakeLists.txt --replace-fail SETUID "" ''; diff --git a/pkgs/tools/misc/getoptions/default.nix b/pkgs/tools/misc/getoptions/default.nix index cf5a21c6d4ff..2ff3d4c64403 100644 --- a/pkgs/tools/misc/getoptions/default.nix +++ b/pkgs/tools/misc/getoptions/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "getoptions"; - version = "3.3.1"; + version = "3.3.2"; src = fetchFromGitHub { owner = "ko1nksm"; repo = "getoptions"; rev = "v${version}"; - hash = "sha256-HHxImHMT5862ysI+1QGkzaA21YsrUUUOH2LwAkVBPf0="; + hash = "sha256-hapOGPibqt2Mm6k73v63gHxrX+lifZ8xcwzj8vWbtgo="; }; makeFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/tools/networking/maubot/default.nix b/pkgs/tools/networking/maubot/default.nix index b66940d92390..dd932804fd1a 100644 --- a/pkgs/tools/networking/maubot/default.nix +++ b/pkgs/tools/networking/maubot/default.nix @@ -62,7 +62,7 @@ let propagatedBuildInputs = with python.pkgs; [ setuptools # requirements.txt - mautrix + (mautrix.override { withOlm = encryptionSupport; }) aiohttp yarl sqlalchemy diff --git a/pkgs/tools/networking/networkmanager/default.nix b/pkgs/tools/networking/networkmanager/default.nix index 8f18bfd3cdaa..fbc7ec0857b5 100644 --- a/pkgs/tools/networking/networkmanager/default.nix +++ b/pkgs/tools/networking/networkmanager/default.nix @@ -60,11 +60,11 @@ let in stdenv.mkDerivation rec { pname = "networkmanager"; - version = "1.48.8"; + version = "1.48.10"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager/${lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz"; - hash = "sha256-YgDqyPHT/mo+ofLEFYs8lbO5+R50zXBOl7CwUbWlSHg="; + hash = "sha256-XcGI/f/PLSPInTSx5jGaayAgPhLq7CSzADe36orIxhM="; }; outputs = [ "out" "dev" "devdoc" "man" "doc" ]; diff --git a/pkgs/tools/security/frida-tools/default.nix b/pkgs/tools/security/frida-tools/default.nix index 9a3bdee5dae2..36abd4ad5c68 100644 --- a/pkgs/tools/security/frida-tools/default.nix +++ b/pkgs/tools/security/frida-tools/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "frida-tools"; - version = "12.3.0"; + version = "12.5.0"; src = fetchPypi { inherit pname version; - hash = "sha256-jtxn0a43kv9bLcY1CM3k0kf5K30Ne/FT10ohptWNwEU="; + hash = "sha256-vlqBN0E+bpfx+TLliZ3hgCaeOEdMRP/rmAfkmjOTqyA="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/default.nix b/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/default.nix index 4bddcd4d18a7..0a8cc8352354 100644 --- a/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/default.nix +++ b/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/default.nix @@ -5,7 +5,7 @@ fetchFromGitHub, }: let - version = "0.4.0"; + version = "0.5.0"; self = ghidra.buildGhidraExtension { pname = "ghidra-delinker-extension"; inherit version; @@ -13,8 +13,8 @@ let src = fetchFromGitHub { owner = "boricj"; repo = "ghidra-delinker-extension"; - rev = "04338fd028bf8b5449ff3f5373635111140bbeda"; - hash = "sha256-tfO92dnpfY13ZbvL36WzV/pC3xH/fbQDICNAF8D4fCI="; + rev = "v${version}"; + hash = "sha256-y0afqqIsWN33b/zGsxJYn8O+R5IP4eD300CgzMymEA0="; }; postPatch = '' diff --git a/pkgs/tools/security/vaultwarden/webvault.nix b/pkgs/tools/security/vaultwarden/webvault.nix index a20ce16cec5c..c4d881373fa2 100644 --- a/pkgs/tools/security/vaultwarden/webvault.nix +++ b/pkgs/tools/security/vaultwarden/webvault.nix @@ -3,18 +3,20 @@ , fetchFromGitHub , git , nixosTests -, python311 +, python3 , vaultwarden }: let - version = "2024.6.2b"; + version = "2024.6.2c"; + + suffix = lib.head (lib.match "[0-9.]*([a-z]*)" version); bw_web_builds = fetchFromGitHub { owner = "dani-garcia"; repo = "bw_web_builds"; rev = "v${version}"; - hash = "sha256-Gcn/TOXdhMqGq4NTCPQTTEvN5rOQS3LImPUYBsv8de8="; + hash = "sha256-Gd8yQx9j6ieUvaM6IPSELNRy83y0cBkBwLYMqk8OIjU="; }; in buildNpmPackage rec { @@ -24,7 +26,7 @@ in buildNpmPackage rec { src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; - rev = "web-v${lib.removeSuffix "b" version}"; + rev = "web-v${lib.removeSuffix suffix version}"; hash = "sha256-HMQ0oQ04WkLlUgsYt6ZpcziDq05mnSA0+VnJCpteceg="; }; @@ -37,8 +39,7 @@ in buildNpmPackage rec { ''; nativeBuildInputs = [ - # signalr through gyp wants to import distutils - python311 + (python3.withPackages (ps: [ ps.setuptools ])) ]; makeCacheWritable = true; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 65ac0671b249..ac453a5a28b4 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -227,6 +227,7 @@ mapAliases ({ chia = throw "chia has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # Added 2023-11-30 chia-dev-tools = throw "chia-dev-tools has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # Added 2023-11-30 chia-plotter = throw "chia-plotter has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # Added 2023-11-30 + chiaki4deck = chiaki-ng; # Added 2024-08-04 chkservice = throw "chkservice has been removed from nixpkgs, as it has been deleted upstream"; # Added 2024-01-08 chocolateDoom = chocolate-doom; # Added 2023-05-01 ChowCentaur = chow-centaur; # Added 2024-06-12 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1e7d1427c45e..ce1cdfdeff14 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1486,8 +1486,6 @@ with pkgs; acquire = with python3Packages; toPythonApplication acquire; - act = callPackage ../development/tools/misc/act { }; - actdiag = with python3.pkgs; toPythonApplication actdiag; actkbd = callPackage ../tools/system/actkbd { }; @@ -1855,8 +1853,6 @@ with pkgs; license-cli = callPackage ../tools/misc/license-cli { }; - license-generator = callPackage ../tools/misc/license-generator { }; - linux-router = callPackage ../tools/networking/linux-router { }; linux-router-without-wifi = linux-router.override { useWifiDependencies = false; }; @@ -6467,8 +6463,6 @@ with pkgs; circus = with python310Packages; toPythonApplication circus; - cirrus-cli = callPackage ../development/tools/continuous-integration/cirrus-cli { }; - cirrusgo = callPackage ../tools/security/cirrusgo { }; inherit (callPackage ../applications/networking/remote/citrix-workspace { }) @@ -8147,6 +8141,8 @@ with pkgs; gnome-solanum = callPackage ../applications/misc/gnome-solanum { }; + gnome-panel-with-modules = callPackage ../by-name/gn/gnome-panel/wrapper.nix { }; + gnome-podcasts = callPackage ../applications/audio/gnome-podcasts { }; gnome-photos = callPackage ../applications/graphics/gnome-photos { }; @@ -21138,8 +21134,6 @@ with pkgs; libbs2b = callPackage ../development/libraries/audio/libbs2b { }; - libbytesize = callPackage ../development/libraries/libbytesize { }; - libcaca = callPackage ../development/libraries/libcaca { }; libcacard = callPackage ../development/libraries/libcacard { }; @@ -28018,9 +28012,7 @@ with pkgs; mobile-broadband-provider-info = callPackage ../data/misc/mobile-broadband-provider-info { }; - mojave-gtk-theme = callPackage ../data/themes/mojave { - inherit (gnome) gnome-shell; - }; + mojave-gtk-theme = callPackage ../data/themes/mojave { }; moka-icon-theme = callPackage ../data/icons/moka-icon-theme { }; @@ -28532,9 +28524,7 @@ with pkgs; vimix-cursor-theme = callPackage ../data/icons/vimix-cursor-theme { }; - vimix-gtk-themes = callPackage ../data/themes/vimix { - inherit (gnome) gnome-shell; - }; + vimix-gtk-themes = callPackage ../data/themes/vimix { }; vimix-icon-theme = callPackage ../data/icons/vimix-icon-theme { }; @@ -28550,9 +28540,7 @@ with pkgs; whitesur-cursors = callPackage ../data/icons/whitesur-cursors { }; - whitesur-gtk-theme = callPackage ../data/themes/whitesur { - inherit (gnome) gnome-shell; - }; + whitesur-gtk-theme = callPackage ../data/themes/whitesur { }; whitesur-icon-theme = callPackage ../data/icons/whitesur-icon-theme { }; @@ -33351,8 +33339,6 @@ with pkgs; maestral-gui = qt6Packages.callPackage ../applications/networking/maestral-qt { }; - maestro = callPackage ../development/mobile/maestro { }; - myfitnesspal = with python3Packages; toPythonApplication myfitnesspal; lemurs = callPackage ../applications/display-managers/lemurs { }; @@ -35430,7 +35416,16 @@ with pkgs; chiaki = libsForQt5.callPackage ../games/chiaki { }; - chiaki4deck = qt6Packages.callPackage ../games/chiaki4deck { }; + chiaki-ng = kdePackages.callPackage ../games/chiaki-ng { + libplacebo = libplacebo.overrideAttrs (old: { + version = "6.338.2-unstable-2024-01-29"; + src = old.src.override { + # broken with 7.349.0 -- pinning to rev used by upstream https://github.com/streetpea/chiaki-ng/blob/96d535db41bb9c3b37fbffcf2402d51e891ff960/scripts/build-libplacebo.sh#L9 + rev = "c320f61e601caef2be081ce61138e5d51c1be21d"; + hash = "sha256-ZlKYgWz/Rkp4IPt6cJ+KNnzBB2s8jGZEamSAOIGyDuE="; + }; + }); + }; chromium-bsu = callPackage ../games/chromium-bsu { }; @@ -36503,13 +36498,14 @@ with pkgs; gnome-extensions-cli = python3Packages.callPackage ../desktops/gnome/misc/gnome-extensions-cli { }; - gnome-text-editor = callPackage ../desktops/gnome/apps/gnome-text-editor { }; - - gnome-tour = callPackage ../desktops/gnome/core/gnome-tour { }; + gnome-bluetooth_1_0 = callPackage ../by-name/gn/gnome-bluetooth/1.0 { }; gnome-browser-connector = callPackage ../desktops/gnome/extensions/gnome-browser-connector { }; - gnome-2048 = callPackage ../desktops/gnome/games/gnome-2048 { }; + gnome-session-ctl = callPackage ../by-name/gn/gnome-session/ctl.nix { }; + + # Using 43 to match Mutter used in Pantheon + gnome-settings-daemon43 = callPackage ../by-name/gn/gnome-settings-daemon/43 { }; gnustep = recurseIntoAttrs (callPackage ../desktops/gnustep { }); @@ -36539,6 +36535,9 @@ with pkgs; mate = recurseIntoAttrs (callPackage ../desktops/mate { }); + # Needed for elementary's gala, wingpanel and greeter until support for higher versions is provided + mutter43 = callPackage ../by-name/mu/mutter/43 { }; + pantheon = recurseIntoAttrs (callPackage ../desktops/pantheon { }); wingpanel-indicator-ayatana = callPackage ../desktops/pantheon/third-party/wingpanel-indicator-ayatana { }; @@ -38157,8 +38156,6 @@ with pkgs; helmsman = callPackage ../applications/networking/cluster/helmsman { }; - velero = callPackage ../applications/networking/cluster/velero { }; - hplip = callPackage ../misc/drivers/hplip { }; hplipWithPlugin = hplip.override { withPlugin = true; }; @@ -39423,10 +39420,6 @@ with pkgs; houdini = callPackage ../applications/misc/houdini { }; - openfst = callPackage ../development/libraries/openfst { }; - - opengrm-ngram = callPackage ../development/libraries/opengrm-ngram { }; - openring = callPackage ../applications/misc/openring { }; openrisk = callPackage ../tools/security/openrisk { }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index bcaa0b0023de..73ca96638605 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -98,6 +98,7 @@ mapAliases ({ chiavdf = throw "chiavdf has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26 chia-rs = throw "chia-rs has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26 class-registry = phx-class-registry; # added 2021-10-05 + cirq-ft = throw "cirq-ft is not longer provieded by cirq upstream"; # added 2024-08-31 cld2-cffi = throw "cld2-cffi has been removed, as the last release was in 2016"; # added 2024-05-20 clvm = throw "clvm has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26 clvm-rs = throw "clvm-rs has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4c04ff4a3740..8eba85145aa3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2219,8 +2219,6 @@ self: super: with self; { cirq-core = callPackage ../development/python-modules/cirq-core { }; - cirq-ft = callPackage ../development/python-modules/cirq-ft { }; - cirq-ionq = callPackage ../development/python-modules/cirq-ionq { }; cirq-google = callPackage ../development/python-modules/cirq-google { }; @@ -7645,6 +7643,7 @@ self: super: with self; { mdformat-footnote = callPackage ../development/python-modules/mdformat-footnote { }; mdformat-frontmatter = callPackage ../development/python-modules/mdformat-frontmatter { }; mdformat-gfm = callPackage ../development/python-modules/mdformat-gfm { }; + mdformat-gfm-alerts = callPackage ../development/python-modules/mdformat-gfm-alerts { }; mdformat-mkdocs = callPackage ../development/python-modules/mdformat-mkdocs { }; mdformat-nix-alejandra = callPackage ../development/python-modules/mdformat-nix-alejandra { }; mdformat-simple-breaks = callPackage ../development/python-modules/mdformat-simple-breaks { }; @@ -9711,6 +9710,8 @@ self: super: with self; { orvibo = callPackage ../development/python-modules/orvibo { }; + os-client-config = callPackage ../development/python-modules/os-client-config { }; + os-service-types = callPackage ../development/python-modules/os-service-types { }; osc = callPackage ../development/python-modules/osc { }; @@ -9757,6 +9758,8 @@ self: super: with self; { ospd = callPackage ../development/python-modules/ospd { }; + osprofiler = callPackage ../development/python-modules/osprofiler { }; + osqp = callPackage ../development/python-modules/osqp { }; oss2 = callPackage ../development/python-modules/oss2 { }; @@ -10583,6 +10586,8 @@ self: super: with self; { python-motionmount = callPackage ../development/python-modules/python-motionmount { }; + python-octaviaclient = callPackage ../development/python-modules/python-octaviaclient { }; + python-otbr-api = callPackage ../development/python-modules/python-otbr-api { }; python-openems = callPackage ../development/python-modules/python-openems { }; @@ -13011,6 +13016,8 @@ self: super: with self; { python-mystrom = callPackage ../development/python-modules/python-mystrom { }; + python-neutronclient = callPackage ../development/python-modules/python-neutronclient { }; + python-nest = callPackage ../development/python-modules/python-nest { }; pythonnet = callPackage ../development/python-modules/pythonnet { };