diff options
37 files changed, 787 insertions, 208 deletions
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 7dc14a61cba..719f61203d2 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -6,6 +6,13 @@ # # For documentation on this file, see https://help.github.com/articles/about-codeowners/ # Mentioned users will get code review requests. +# +# IMPORTANT NOTE: in order to actually get pinged, commit access is required. +# This also holds true for GitHub teams. Since almost none of our teams have write +# permissions, you need to list all members of the team with commit access individually. +# We still add the team to the list next to its members, this helps keeping things +# in sync. (Put non team members before the team to distinguish them.) +# See https://github.com/NixOS/nixpkgs/issues/124085 for more details # This file /.github/CODEOWNERS @edolstra @@ -210,11 +217,11 @@ /pkgs/top-level/php-packages.nix @jtojnar @NixOS/php @aanderse @etu @globin @ma27 @talyz # Podman, CRI-O modules and related -/nixos/modules/virtualisation/containers.nix @NixOS/podman @zowoq -/nixos/modules/virtualisation/cri-o.nix @NixOS/podman @zowoq -/nixos/modules/virtualisation/podman.nix @NixOS/podman @zowoq -/nixos/tests/cri-o.nix @NixOS/podman @zowoq -/nixos/tests/podman.nix @NixOS/podman @zowoq +/nixos/modules/virtualisation/containers.nix @NixOS/podman @zowoq @adisbladis +/nixos/modules/virtualisation/cri-o.nix @NixOS/podman @zowoq @adisbladis +/nixos/modules/virtualisation/podman.nix @NixOS/podman @zowoq @adisbladis +/nixos/tests/cri-o.nix @NixOS/podman @zowoq @adisbladis +/nixos/tests/podman.nix @NixOS/podman @zowoq @adisbladis # Docker tools /pkgs/build-support/docker @roberth @utdemir @@ -230,6 +237,10 @@ /pkgs/development/go-modules @kalbasit @Mic92 @zowoq /pkgs/development/go-packages @kalbasit @Mic92 @zowoq +# GNOME +/pkgs/desktops/gnome @NixOS/GNOME @jtojnar @hedning +/pkgs/desktops/gnome/extensions @piegamesde @NixOS/GNOME @jtojnar @hedning + # Cinnamon /pkgs/desktops/cinnamon @mkg20001 diff --git a/doc/languages-frameworks/beam.section.md b/doc/languages-frameworks/beam.section.md index fb608932dfc..9b09d0329c5 100644 --- a/doc/languages-frameworks/beam.section.md +++ b/doc/languages-frameworks/beam.section.md @@ -291,10 +291,10 @@ let # define packages to install basePackages = [ git - # replace with beam.packages.erlang.elixir_1_11 if you need + # replace with beam.packages.erlang.elixir_1_13 if you need beam.packages.erlang.elixir nodejs - postgresql_13 + postgresql_14 # only used for frontend dependencies # you are free to use yarn2nix as well nodePackages.node2nix @@ -312,10 +312,11 @@ let mkdir -p .nix-mix .nix-hex export MIX_HOME=$PWD/.nix-mix export HEX_HOME=$PWD/.nix-mix + # make hex from Nixpkgs available + # `mix local.hex` will install hex into MIX_HOME and should take precedence + export MIX_PATH="${beam.packages.erlang.hex}/lib/erlang/lib/hex/ebin" export PATH=$MIX_HOME/bin:$HEX_HOME/bin:$PATH - # TODO: not sure how to make hex available without installing it afterwards. - mix local.hex --if-missing - export LANG=en_US.UTF-8 + export LANG=C.UTF-8 # keep your shell history in iex export ERL_AFLAGS="-kernel shell_history enabled" diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index bc71b9718c7..1a1a9caaa46 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2553,6 +2553,17 @@ githubId = 1298344; name = "Daniel Fullmer"; }; + danth = { + name = "Daniel Thwaites"; + email = "danthwaites30@btinternet.com"; + matrix = "@danth:matrix.org"; + github = "danth"; + githubId = 28959268; + keys = [{ + longkeyid = "rsa3072/0xD8AFC4BF05670F9D"; + fingerprint = "4779 D1D5 3C97 2EAE 34A5 ED3D D8AF C4BF 0567 0F9D"; + }]; + }; dan4ik605743 = { email = "6057430gu@gmail.com"; github = "dan4ik605743"; diff --git a/nixos/modules/services/misc/mx-puppet-discord.nix b/nixos/modules/services/misc/mx-puppet-discord.nix index c34803f9722..fb759245829 100644 --- a/nixos/modules/services/misc/mx-puppet-discord.nix +++ b/nixos/modules/services/misc/mx-puppet-discord.nix @@ -39,7 +39,7 @@ in { #defaults to sqlite but can be configured to use postgresql with #connstring - database.filename = "${dataDir}/mx-puppet-discord/database.db"; + database.filename = "${dataDir}/database.db"; logging = { console = "info"; lineDateFormat = "MMM-D HH:mm:ss.SSS"; @@ -110,7 +110,9 @@ in { UMask = 0027; ExecStart = '' - ${pkgs.mx-puppet-discord}/bin/mx-puppet-discord -c ${settingsFile} + ${pkgs.mx-puppet-discord}/bin/mx-puppet-discord \ + -c ${settingsFile} \ + -f ${registrationFile} ''; }; }; diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index 8a1793484e2..9bacdaa9be9 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -4,6 +4,28 @@ let xcfg = config.services.xserver; cfg = xcfg.desktopManager.plasma5; + # Use only for **internal** options. + # This is not exactly user-friendly. + kdeConfigurationType = with types; + let + valueTypes = (oneOf [ + bool + float + int + str + ]) // { + description = "KDE Configuration value"; + emptyValue.value = ""; + }; + set = (nullOr (lazyAttrsOf valueTypes)) // { + description = "KDE Configuration set"; + emptyValue.value = {}; + }; + in (lazyAttrsOf set) // { + description = "KDE Configuration file"; + emptyValue.value = {}; + }; + libsForQt5 = pkgs.plasma5Packages; inherit (libsForQt5) kdeGear kdeFrameworks plasma5; inherit (pkgs) writeText; @@ -169,6 +191,37 @@ in type = types.bool; default = false; }; + + # Internally allows configuring kdeglobals globally + kdeglobals = mkOption { + internal = true; + default = {}; + type = kdeConfigurationType; + }; + + # Internally allows configuring kwin globally + kwinrc = mkOption { + internal = true; + default = {}; + type = kdeConfigurationType; + }; + + mobile.enable = mkOption { + type = types.bool; + default = false; + description = '' + Enable support for running the Plasma Mobile shell. + ''; + }; + + mobile.installRecommendedSoftware = mkOption { + type = types.bool; + default = true; + description = '' + Installs software recommended for use with Plasma Mobile, but which + is not strictly required for Plasma Mobile to run. + ''; + }; }; imports = [ @@ -177,22 +230,8 @@ in ]; config = mkMerge [ - (mkIf cfg.enable { - - # Seed our configuration into nixos-generate-config - system.nixos-generate-config.desktopConfiguration = [ - '' - # Enable the Plasma 5 Desktop Environment. - services.xserver.displayManager.sddm.enable = true; - services.xserver.desktopManager.plasma5.enable = true; - '' - ]; - - services.xserver.displayManager.sessionPackages = [ pkgs.libsForQt5.plasma5.plasma-workspace ]; - # Default to be `plasma` (X11) instead of `plasmawayland`, since plasma wayland currently has - # many tiny bugs. - # See: https://github.com/NixOS/nixpkgs/issues/143272 - services.xserver.displayManager.defaultSession = mkDefault "plasma"; + # Common Plasma dependencies + (mkIf (cfg.enable || cfg.mobile.enable) { security.wrappers = { kcheckpass = { @@ -278,37 +317,24 @@ in kdeplasma-addons kgamma5 khotkeys - kinfocenter - kmenuedit kscreen kscreenlocker - ksystemstats kwayland kwin kwrited libkscreen libksysguard milou - plasma-systemmonitor plasma-browser-integration plasma-integration polkit-kde-agent - spectacle - systemsettings plasma-desktop plasma-workspace plasma-workspace-wallpapers - dolphin - dolphin-plugins - ffmpegthumbs - kdegraphics-thumbnailers - khelpcenter - kio-extras konsole oxygen - print-manager breeze-icons pkgs.hicolor-icon-theme @@ -319,10 +345,6 @@ in qtvirtualkeyboard pkgs.xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/ - - elisa - gwenview - okular ] # Phonon audio backend @@ -396,7 +418,67 @@ in serviceConfig.Type = "oneshot"; script = activationScript; }; + }; + + xdg.portal.enable = true; + xdg.portal.extraPortals = [ plasma5.xdg-desktop-portal-kde ]; + + # Update the start menu for each user that is currently logged in + system.userActivationScripts.plasmaSetup = activationScript; + services.xserver.displayManager.setupCommands = startplasma; + + nixpkgs.config.firefox.enablePlasmaBrowserIntegration = true; + + environment.etc = { + "xdg/kwinrc".text = lib.generators.toINI {} cfg.kwinrc; + "xdg/kdeglobals".text = lib.generators.toINI {} cfg.kdeglobals; + }; + }) + + # Plasma Desktop + (mkIf cfg.enable { + + # Seed our configuration into nixos-generate-config + system.nixos-generate-config.desktopConfiguration = [ + '' + # Enable the Plasma 5 Desktop Environment. + services.xserver.displayManager.sddm.enable = true; + services.xserver.desktopManager.plasma5.enable = true; + '' + ]; + services.xserver.displayManager.sessionPackages = [ pkgs.libsForQt5.plasma5.plasma-workspace ]; + # Default to be `plasma` (X11) instead of `plasmawayland`, since plasma wayland currently has + # many tiny bugs. + # See: https://github.com/NixOS/nixpkgs/issues/143272 + services.xserver.displayManager.defaultSession = mkDefault "plasma"; + + environment.systemPackages = + with libsForQt5; + with plasma5; with kdeGear; with kdeFrameworks; + [ + ksystemstats + kinfocenter + kmenuedit + plasma-systemmonitor + spectacle + systemsettings + + dolphin + dolphin-plugins + ffmpegthumbs + kdegraphics-thumbnailers + khelpcenter + kio-extras + print-manager + + elisa + gwenview + okular + ] + ; + + systemd.user.services = { plasma-run-with-systemd = { description = "Run KDE Plasma via systemd"; wantedBy = [ "basic.target" ]; @@ -409,15 +491,88 @@ in ''; }; }; + }) - xdg.portal.enable = true; - xdg.portal.extraPortals = [ plasma5.xdg-desktop-portal-kde ]; + # Plasma Mobile + (mkIf cfg.mobile.enable { + assertions = [ + { + # The user interface breaks without NetworkManager + assertion = config.networking.networkmanager.enable; + message = "Plasma Mobile requires NetworkManager."; + } + { + # The user interface breaks without bluetooth + assertion = config.hardware.bluetooth.enable; + message = "Plasma Mobile requires Bluetooth."; + } + { + # The user interface breaks without pulse + assertion = config.hardware.pulseaudio.enable; + message = "Plasma Mobile requires pulseaudio."; + } + ]; - # Update the start menu for each user that is currently logged in - system.userActivationScripts.plasmaSetup = activationScript; - services.xserver.displayManager.setupCommands = startplasma; + environment.systemPackages = + with libsForQt5; + with plasma5; with kdeApplications; with kdeFrameworks; + [ + # Basic packages without which Plasma Mobile fails to work properly. + plasma-phone-components + plasma-nano + pkgs.maliit-framework + pkgs.maliit-keyboard + ] + ++ lib.optionals (cfg.mobile.installRecommendedSoftware) (with libsForQt5.plasmaMobileGear;[ + # Additional software made for Plasma Mobile. + alligator + angelfish + audiotube + calindori + kalk + kasts + kclock + keysmith + koko + krecorder + ktrip + kweather + plasma-dialer + plasma-phonebook + plasma-settings + spacebar + ]) + ; + + # The following services are needed or the UI is broken. + hardware.bluetooth.enable = true; + hardware.pulseaudio.enable = true; + networking.networkmanager.enable = true; + + # Recommendations can be found here: + # - https://invent.kde.org/plasma-mobile/plasma-phone-settings/-/tree/master/etc/xdg + # This configuration is the minimum required for Plasma Mobile to *work*. + services.xserver.desktopManager.plasma5 = { + kdeglobals = { + KDE = { + # This forces a numeric PIN for the lockscreen, which is the + # recommendation from upstream. + LookAndFeelPackage = lib.mkDefault "org.kde.plasma.phone"; + }; + }; + kwinrc = { + Windows = { + # Forces windows to be maximized + Placement = lib.mkDefault "Maximizing"; + }; + "org.kde.kdecoration2" = { + # No decorations (title bar) + NoPlugin = lib.mkDefault "true"; + }; + }; + }; - nixpkgs.config.firefox.enablePlasmaBrowserIntegration = true; + services.xserver.displayManager.sessionPackages = [ pkgs.libsForQt5.plasma5.plasma-phone-components ]; }) ]; } diff --git a/nixos/tests/vault-postgresql.nix b/nixos/tests/vault-postgresql.nix index 071cfd106ff..2847af13cbf 100644 --- a/nixos/tests/vault-postgresql.nix +++ b/nixos/tests/vault-postgresql.nix @@ -64,6 +64,6 @@ import ./make-test-python.nix ({ pkgs, ... }: machine.wait_for_unit("vault.service") machine.wait_for_open_port(8200) machine.succeed("vault operator init") - machine.succeed("vault status | grep Sealed | grep true") + machine.succeed("vault status || test $? -eq 2") ''; }) diff --git a/pkgs/applications/graphics/ascii-image-converter/default.nix b/pkgs/applications/graphics/ascii-image-converter/default.nix new file mode 100644 index 00000000000..aaed39b50da --- /dev/null +++ b/pkgs/applications/graphics/ascii-image-converter/default.nix @@ -0,0 +1,23 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "ascii-image-converter"; + version = "1.11.0"; + + src = fetchFromGitHub { + owner = "TheZoraiz"; + repo = "ascii-image-converter"; + rev = "v${version}"; + sha256 = "DitJnWIz1Dt9yXtyQp/z738IAmG4neYmfc49Wdjos7Q="; + }; + + runVend = true; + vendorSha256 = "JKrBMhzBL1+jlMPudynjOc/ekFiUVaxltyLr4V8QZbg="; + + meta = with lib; { + description = "Convert images into ASCII art on the console"; + homepage = "https://github.com/TheZoraiz/ascii-image-converter#readme"; + license = licenses.asl20; + maintainers = [ maintainers.danth ]; + }; +} diff --git a/pkgs/applications/misc/maliit-framework/default.nix b/pkgs/applications/misc/maliit-framework/default.nix new file mode 100644 index 00000000000..6a6e66f293b --- /dev/null +++ b/pkgs/applications/misc/maliit-framework/default.nix @@ -0,0 +1,68 @@ +{ mkDerivation +, lib +, fetchFromGitHub + +, at-spi2-atk +, at-spi2-core +, libepoxy +, gtk3 +, libdatrie +, libselinux +, libsepol +, libthai +, pcre +, util-linux +, wayland +, xorg + +, cmake +, doxygen +, pkg-config +, wayland-protocols +}: + +mkDerivation rec { + pname = "maliit-framework"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "maliit"; + repo = "framework"; + rev = version; + sha256 = "138jyvw130kmrldksbk4l38gvvahh3x51zi4vyplad0z5nxmbazb"; + }; + + buildInputs = [ + at-spi2-atk + at-spi2-core + libepoxy + gtk3 + libdatrie + libselinux + libsepol + libthai + pcre + util-linux + wayland + xorg.libXdmcp + xorg.libXtst + ]; + + nativeBuildInputs = [ + cmake + doxygen + pkg-config + wayland-protocols + ]; + + preConfigure = '' + cmakeFlags+="-DQT5_PLUGINS_INSTALL_DIR=$out/$qtPluginPrefix" + ''; + + meta = with lib; { + description = "Core libraries of Maliit and server"; + homepage = "http://maliit.github.io/"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ samueldr ]; + }; +} diff --git a/pkgs/applications/misc/maliit-keyboard/default.nix b/pkgs/applications/misc/maliit-keyboard/default.nix new file mode 100644 index 00000000000..fcbd6cbff19 --- /dev/null +++ b/pkgs/applications/misc/maliit-keyboard/default.nix @@ -0,0 +1,82 @@ +{ mkDerivation +, lib +, fetchFromGitHub +, fetchpatch + +, anthy +, hunspell +, libchewing +, libpinyin +, maliit-framework +, pcre +, presage +, qtfeedback +, qtmultimedia +, qtquickcontrols2 +, qtgraphicaleffects + +, cmake +, pkg-config +, wrapGAppsHook +}: + +mkDerivation rec { + pname = "maliit-keyboard"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "maliit"; + repo = "keyboard"; + rev = version; + sha256 = "10dh0abxq90024dqq3fs8mjxww3igb4l09d19i2fq9f3flvh11hc"; + }; + + patches = [ + (fetchpatch { + # https://github.com/maliit/keyboard/pull/34 + url = "https://github.com/maliit/keyboard/commit/9848a73b737ad46b5790ebf713a559d340c91b82.patch"; + sha256 = "0qrsga0npahjrgbl6mycvl6d6vjm0d17i5jadcn7y6khbhq2y6rg"; + }) + ]; + + postPatch = '' + substituteInPlace data/schemas/org.maliit.keyboard.maliit.gschema.xml \ + --replace /usr/share "$out/share" + ''; + + buildInputs = [ + anthy + hunspell + libchewing + libpinyin + maliit-framework + pcre + presage + qtfeedback + qtmultimedia + qtquickcontrols2 + qtgraphicaleffects + ]; + + cmakeFlags = [ + "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}" + "-DCMAKE_INSTALL_LIBDIR=lib" + ]; + + nativeBuildInputs = [ + cmake + pkg-config + wrapGAppsHook + ]; + + postInstall = '' + glib-compile-schemas "$out"/share/glib-2.0/schemas + ''; + + meta = with lib; { + description = "Virtual keyboard"; + homepage = "http://maliit.github.io/"; + license = with licenses; [ lgpl3Only bsd3 cc-by-30 ]; + maintainers = with maintainers; [ samueldr ]; + }; +} diff --git a/pkgs/applications/plasma-mobile/default.nix b/pkgs/applications/plasma-mobile/default.nix index fd9ae2a2bae..10c1f1d0e9b 100644 --- a/pkgs/applications/plasma-mobile/default.nix +++ b/pkgs/applications/plasma-mobile/default.nix @@ -75,6 +75,7 @@ let kweather = callPackage ./kweather.nix {}; plasma-dialer = callPackage ./plasma-dialer.nix {}; plasma-phonebook = callPackage ./plasma-phonebook.nix {}; + plasma-settings = callPackage ./plasma-settings.nix {}; spacebar = callPackage ./spacebar.nix {}; }; diff --git a/pkgs/applications/plasma-mobile/plasma-settings.nix b/pkgs/applications/plasma-mobile/plasma-settings.nix new file mode 100644 index 00000000000..bcd04dadca2 --- /dev/null +++ b/pkgs/applications/plasma-mobile/plasma-settings.nix @@ -0,0 +1,42 @@ +{ lib +, mkDerivation +, fetchFromGitLab + +, cmake +, extra-cmake-modules + +, kauth +, kconfig +, kcoreaddons +, kdbusaddons +, ki18n +, kitemmodels +, plasma-framework +}: + +mkDerivation rec { + pname = "plasma-settings"; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + buildInputs = [ + kauth + kconfig + kcoreaddons + kdbusaddons + ki18n + kitemmodels + plasma-framework + ]; + + meta = with lib; { + description = "Settings application for Plasma Mobile"; + homepage = "https://invent.kde.org/plasma-mobile/plasma-settings"; + # https://invent.kde.org/plasma-mobile/plasma-settings/-/commit/a59007f383308503e59498b3036e1483bca26e35 + license = licenses.gpl2Plus; + maintainers = with maintainers; [ samueldr ]; + }; +} diff --git a/pkgs/applications/radio/qradiolink/default.nix b/pkgs/applications/radio/qradiolink/default.nix index 31be8f4fb8b..6960eba6a57 100644 --- a/pkgs/applications/radio/qradiolink/default.nix +++ b/pkgs/applications/radio/qradiolink/default.nix @@ -14,6 +14,7 @@ , libjpeg , libsndfile , libftdi +, limesuite , protobuf , speex , speexdsp @@ -21,13 +22,13 @@ gnuradio3_8.pkgs.mkDerivation rec { pname = "qradiolink"; - version = "0.8.5-2"; + version = "0.8.6-2"; src = fetchFromGitHub { owner = "qradiolink"; repo = "qradiolink"; rev = version; - sha256 = "MgHfKR3AJW3pIN9oCBr4BWxk1fGSCpLmMzjxvuTmuFA="; + sha256 = "1694yyw0vc77m5pbc5rwl6khd8000dbrliz3q4vsa9dqnfnz1777"; }; preBuild = '' @@ -55,6 +56,7 @@ gnuradio3_8.pkgs.mkDerivation rec { gnuradio3_8.pkgs.osmosdr libopus libjpeg + limesuite speex speexdsp gnuradio3_8.qt.qtbase diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index 855f90a74a3..27a16aefb2c 100644 --- a/pkgs/applications/science/biology/picard-tools/default.nix +++ b/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "picard-tools"; - version = "2.26.4"; + version = "2.26.6"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "sha256-KVOQuqudne0SAdgFEft/lTuoDn9vcpuDtMAafztYvPo="; + sha256 = "sha256-Y/vBc97Vkv2RpuGyFqEMwdknchYuwBCTCHpVQ5+3EqM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/data/themes/whitesur/default.nix b/pkgs/data/themes/whitesur/default.nix index 46594e4f5e1..cbf08acce5c 100644 --- a/pkgs/data/themes/whitesur/default.nix +++ b/pkgs/data/themes/whitesur/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "whitesur-gtk-theme"; - version = "2021-10-21"; + version = "2021-12-04"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "1rbwf6z2bda647kw00q2fp349gjzvdc4gyk986fkjli0nr0jh8hp"; + sha256 = "0fpq6xw2xq0fkmpg1la9q26nfbqhf0212s95v25256miz55p67ha"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/extensions/extensionOverrides.nix b/pkgs/desktops/gnome/extensions/extensionOverrides.nix index 357c3a73a51..b431e7da442 100644 --- a/pkgs/desktops/gnome/extensions/extensionOverrides.nix +++ b/pkgs/desktops/gnome/extensions/extensionOverrides.nix @@ -1,8 +1,12 @@ { lib , ddcutil , gjs +, gnome +, gobject-introspection , xprop , touchegg +, vte +, wrapGAppsHook }: let # Helper method to reduce redundancy @@ -25,6 +29,21 @@ super: lib.trivial.pipe super [ meta.maintainers = with lib.maintainers; [ eperuffo jtojnar rhoriguchi ]; })) + (patchExtension "ddterm@amezin.github.com" (old: { + # Requires gjs, zenity & vte via the typelib + nativeBuildInputs = [ gobject-introspection wrapGAppsHook ]; + buildInputs = [ vte ]; + postPatch = '' + for file in *.js com.github.amezin.ddterm; do + substituteInPlace $file --replace "gjs" "${gjs}/bin/gjs" + substituteInPlace $file --replace "zenity" "${gnome.zenity}/bin/zenity" + done + ''; + postFixup = '' + wrapGApp "$out/share/gnome-shell/extensions/ddterm@amezin.github.com/com.github.amezin.ddterm" + ''; + })) + (patchExtension "display-brightness-ddcutil@themightydeity.github.com" (old: { # Has a hard-coded path to a run-time dependency # https://github.com/NixOS/nixpkgs/issues/136111 diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index 8abf2b37dbe..dd3634ac7cd 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -134,9 +134,11 @@ let milou = callPackage ./milou.nix {}; oxygen = callPackage ./oxygen.nix {}; plasma-browser-integration = callPackage ./plasma-browser-integration.nix {}; + plasma-phone-components = callPackage ./plasma-phone-components {}; plasma-desktop = callPackage ./plasma-desktop {}; plasma-disks = callPackage ./plasma-disks.nix {}; plasma-integration = callPackage ./plasma-integration {}; + plasma-nano = callPackage ./plasma-nano {}; plasma-nm = callPackage ./plasma-nm {}; plasma-pa = callPackage ./plasma-pa.nix { inherit gconf; }; plasma-sdk = callPackage ./plasma-sdk.nix {}; diff --git a/pkgs/desktops/plasma-5/plasma-nano/default.nix b/pkgs/desktops/plasma-5/plasma-nano/default.nix new file mode 100644 index 00000000000..0960eec33f2 --- /dev/null +++ b/pkgs/desktops/plasma-5/plasma-nano/default.nix @@ -0,0 +1,13 @@ +{ + mkDerivation, + extra-cmake-modules, + plasma-framework +}: + +mkDerivation { + name = "plasma-nano"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + plasma-framework + ]; +} diff --git a/pkgs/desktops/plasma-5/plasma-phone-components/default.nix b/pkgs/desktops/plasma-5/plasma-phone-components/default.nix new file mode 100644 index 00000000000..d925d7e408b --- /dev/null +++ b/pkgs/desktops/plasma-5/plasma-phone-components/default.nix @@ -0,0 +1,43 @@ +{ + mkDerivation, lib, + + extra-cmake-modules, kdoctools, + + coreutils, dbus, gnugrep, gnused, libdbusmenu, pam, wayland, appstream, + + kdeclarative, kdelibs4support, kpeople, kconfig, krunner, kinit, kwayland, kwin, + plasma-framework, telepathy, libphonenumber, protobuf, libqofono, modemmanager-qt, + plasma-workspace, + maliit-framework, maliit-keyboard, + + qtwayland, qttools +}: + +let inherit (lib) getBin getLib; in + +mkDerivation { + name = "plasma-phone-components"; + + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + appstream libdbusmenu pam wayland + kdeclarative kdelibs4support kpeople kconfig krunner kinit kwayland kwin + plasma-framework telepathy libphonenumber protobuf libqofono modemmanager-qt + maliit-framework maliit-keyboard + ]; + + postPatch = '' + substituteInPlace bin/kwinwrapper.in \ + --replace @KDE_INSTALL_FULL_LIBEXECDIR@ "${plasma-workspace}/libexec" + + substituteInPlace bin/plasma-mobile.desktop.cmake \ + --replace @CMAKE_INSTALL_FULL_LIBEXECDIR@ "${plasma-workspace}/libexec" + ''; + + # Ensures dependencies like libqofono (at the very least) are present for the shell. + preFixup = '' + wrapQtApp "$out/bin/kwinwrapper" + ''; + + passthru.providedSessions = [ "plasma-mobile" ]; +} diff --git a/pkgs/development/python-modules/adblock/default.nix b/pkgs/development/python-modules/adblock/default.nix index 2763684c0d4..941beb54473 100644 --- a/pkgs/development/python-modules/adblock/default.nix +++ b/pkgs/development/python-modules/adblock/default.nix @@ -1,12 +1,12 @@ -{ stdenv -, lib +{ lib +, stdenv , fetchFromGitHub , buildPythonPackage , rustPlatform , pkg-config , openssl , publicsuffix-list -, isPy27 +, pythonOlder , libiconv , CoreFoundation , Security @@ -16,34 +16,46 @@ buildPythonPackage rec { pname = "adblock"; - version = "0.5.0"; - disabled = isPy27; + version = "0.5.1"; + format = "pyproject"; + + disabled = pythonOlder "3.6"; # Pypi only has binary releases src = fetchFromGitHub { owner = "ArniDagur"; repo = "python-adblock"; rev = version; - sha256 = "sha256-JjmMfL24778T6LCuElXsD7cJxQ+RkqbNEnEqwoN24WE="; + sha256 = "sha256-f6PmEHVahQv8t+WOkE8DO2emivHG2t14hUSIf/l8omY="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-w+/W4T3ukRHNpCPjhlHZLPn6sgCpz4QHVD8VW+Rw5BI="; + hash = "sha256-x0mcykHWhheD2ycELcfR1ZQ/6WfFQzY+L/LmMipP4Rc="; }; - format = "pyproject"; - - nativeBuildInputs = [ pkg-config ] - ++ (with rustPlatform; [ cargoSetupHook maturinBuildHook ]); + nativeBuildInputs = [ + pkg-config + ] ++ (with rustPlatform; [ + cargoSetupHook + maturinBuildHook + ]); - buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ libiconv CoreFoundation Security ]; + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + libiconv + CoreFoundation + Security + ]; PSL_PATH = "${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat"; - checkInputs = [ pytestCheckHook toml ]; + checkInputs = [ + pytestCheckHook + toml + ]; preCheck = '' # import from $out instead @@ -55,12 +67,15 @@ buildPythonPackage rec { "tests/test_typestubs.py" ]; - pythonImportsCheck = [ "adblock" "adblock.adblock" ]; + pythonImportsCheck = [ + "adblock" + "adblock.adblock" + ]; meta = with lib; { - description = "Python wrapper for Brave's adblocking library, which is written in Rust"; + description = "Python wrapper for Brave's adblocking library"; homepage = "https://github.com/ArniDagur/python-adblock/"; maintainers = with maintainers; [ petabyteboy dotlambda ]; - license = with licenses; [ asl20 mit ]; + license = with licenses; [ asl20 /* or */ mit ]; }; } diff --git a/pkgs/development/python-modules/flux-led/default.nix b/pkgs/development/python-modules/flux-led/default.nix index 58e271b10dc..fc343f71b0e 100644 --- a/pkgs/development/python-modules/flux-led/default.nix +++ b/pkgs/development/python-modules/flux-led/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "flux-led"; - version = "0.25.10"; + version = "0.25.13"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "flux_led"; rev = version; - sha256 = "sha256-WkLwiQNwueksPpuQ5aMBsenKyzUid1fbeOqEDAhfjkA="; + sha256 = "sha256-ZWaKk9496AKlQIni+VmnyIda9kn5zQfzmaD76DznQNU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix index 89d8c288a79..08582d66226 100644 --- a/pkgs/development/python-modules/jupytext/default.nix +++ b/pkgs/development/python-modules/jupytext/default.nix @@ -1,23 +1,23 @@ { lib , buildPythonPackage , fetchFromGitHub -, pythonOlder , GitPython -, jupyter-packaging , jupyter-client +, jupyter-packaging , jupyterlab , markdown-it-py , mdit-py-plugins , nbformat , notebook , pytestCheckHook +, pythonOlder , pyyaml , toml }: buildPythonPackage rec { pname = "jupytext"; - version = "1.11.2"; + version = "1.13.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -26,10 +26,14 @@ buildPythonPackage rec { owner = "mwouts"; repo = pname; rev = "v${version}"; - hash = "sha256-S2SKAC2oT4VIVMMDbu/Puo87noAgnQs1hh88JphutA8="; + sha256 = "sha256-S2SKAC2oT4VIVMMDbu/Puo87noAgnQs1hh88JphutA8="; }; - buildInputs = [ jupyter-packaging jupyterlab ]; + buildInputs = [ + jupyter-packaging + jupyterlab + ]; + propagatedBuildInputs = [ markdown-it-py mdit-py-plugins @@ -39,16 +43,32 @@ buildPythonPackage rec { ]; checkInputs = [ - pytestCheckHook GitPython jupyter-client notebook + pytestCheckHook + ]; + + postPatch = '' + # https://github.com/mwouts/jupytext/pull/885 + substituteInPlace setup.py \ + --replace "markdown-it-py[plugins]>=1.0.0b3,<2.0.0" "markdown-it-py[plugins]>=1.0" + ''; + + preCheck = '' + # Tests that use a Jupyter notebook require $HOME to be writable + export HOME=$(mktemp -d); + ''; + + pytestFlagsArray = [ + # Pre-commit tests expect the source directory to be a Git repository + "--ignore-glob='tests/test_pre_commit_*.py'" + ]; + + pythonImportsCheck = [ + "jupytext" + "jupytext.cli" ]; - # Tests that use a Jupyter notebook require $HOME to be writable. - HOME = "$TMPDIR"; - # Pre-commit tests expect the source directory to be a Git repository. - pytestFlagsArray = [ "--ignore-glob='tests/test_pre_commit_*.py'" ]; - pythonImportsCheck = [ "jupytext" "jupytext.cli" ]; meta = with lib; { description = "Jupyter notebooks as Markdown documents, Julia, Python or R scripts"; diff --git a/pkgs/development/python-modules/markdown-it-py/default.nix b/pkgs/development/python-modules/markdown-it-py/default.nix index 8ed57f3ff03..f056c104e75 100644 --- a/pkgs/development/python-modules/markdown-it-py/default.nix +++ b/pkgs/development/python-modules/markdown-it-py/default.nix @@ -1,19 +1,20 @@ { lib +, attrs , buildPythonPackage , fetchFromGitHub -, pytestCheckHook -, pythonOlder -, attrs , linkify-it-py +, mdurl , psutil , pytest-benchmark , pytest-regressions +, pytestCheckHook +, pythonOlder , typing-extensions }: buildPythonPackage rec { pname = "markdown-it-py"; - version = "1.1.0"; + version = "2.0.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -22,11 +23,16 @@ buildPythonPackage rec { owner = "executablebooks"; repo = pname; rev = "v${version}"; - sha256 = "0h7rn3rcqfwmnqs97qczwkw9w5g4df8bgn6sw7k149svfqgrkf56"; + sha256 = "sha256-ahg+aAVpAh07PZ1mfrne0EP9K2J4tb8eLp5XXFpWp00="; }; - propagatedBuildInputs = [ attrs linkify-it-py ] - ++ lib.optional (pythonOlder "3.8") typing-extensions; + propagatedBuildInputs = [ + attrs + linkify-it-py + mdurl + ] ++ lib.optional (pythonOlder "3.8") [ + typing-extensions + ]; checkInputs = [ psutil @@ -34,11 +40,14 @@ buildPythonPackage rec { pytest-regressions pytestCheckHook ]; - pythonImportsCheck = [ "markdown_it" ]; + + pythonImportsCheck = [ + "markdown_it" + ]; meta = with lib; { - description = "Markdown parser done right"; - homepage = "https://markdown-it-py.readthedocs.io/en/latest"; + description = "Markdown parser in Python"; + homepage = "https://markdown-it-py.readthedocs.io/"; changelog = "https://github.com/executablebooks/markdown-it-py/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ bhipple ]; diff --git a/pkgs/development/python-modules/mdformat/default.nix b/pkgs/development/python-modules/mdformat/default.nix index 101ed2aa134..02aafd3302a 100644 --- a/pkgs/development/python-modules/mdformat/default.nix +++ b/pkgs/development/python-modules/mdformat/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "mdformat"; - version = "0.7.10"; + version = "0.7.11"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "executablebooks"; repo = pname; rev = version; - sha256 = "sha256-Zw7ZGV/Hd0MRxxQVwkjtE6MJXNLQ0A0PJlQr4x9h2ww="; + sha256 = "sha256-EhMoGSCtlEcm1+1aHn9DhBnLQvolhq62SMF/AdaY1/E="; }; nativeBuildInputs = [ @@ -41,7 +41,16 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "mdformat" ]; + disabledTests = [ + # AssertionError + "test_no_codeblock_trailing_newline" + # Issue with upper/lower case + "default_style.md-options0" + ]; + + pythonImportsCheck = [ + "mdformat" + ]; meta = with lib; { description = "CommonMark compliant Markdown formatter"; diff --git a/pkgs/development/python-modules/mdit-py-plugins/default.nix b/pkgs/development/python-modules/mdit-py-plugins/default.nix index 9c5705dbc40..03a64588f85 100644 --- a/pkgs/development/python-modules/mdit-py-plugins/default.nix +++ b/pkgs/development/python-modules/mdit-py-plugins/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "mdit-py-plugins"; - version = "0.2.8"; + version = "0.3.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -18,13 +18,21 @@ buildPythonPackage rec { owner = "executablebooks"; repo = pname; rev = "v${version}"; - hash = "sha256-MXQjaVDuguGbmby6BQnrTdpq6Mih3HabXuyFxf9jB18="; + sha256 = "sha256-3zFSTjqwjUV6+fU6falYbIzj/Hp7E/9EXKZIi00tkg4="; }; - propagatedBuildInputs = [ markdown-it-py ]; + propagatedBuildInputs = [ + markdown-it-py + ]; - checkInputs = [ pytestCheckHook pytest-regressions ]; - pythonImportsCheck = [ "mdit_py_plugins" ]; + checkInputs = [ + pytestCheckHook + pytest-regressions + ]; + + pythonImportsCheck = [ + "mdit_py_plugins" + ]; meta = with lib; { description = "Collection of core plugins for markdown-it-py"; diff --git a/pkgs/development/python-modules/mdurl/default.nix b/pkgs/development/python-modules/mdurl/default.nix new file mode 100644 index 00000000000..37b3e9ad56a --- /dev/null +++ b/pkgs/development/python-modules/mdurl/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, flit-core +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "mdurl"; + version = "0.1.0"; + format = "pyproject"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "hukkin"; + repo = pname; + rev = version; + sha256 = "sha256-AVklWFc4o5R9OzS9BYauuOaxm89P/Ih5l3Vrb2P0El4="; + }; + + nativeBuildInputs = [ + flit-core + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "mdurl" + ]; + + meta = with lib; { + description = "URL utilities for markdown-it"; + homepage = "https://github.com/hukkin/mdurl"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/myfitnesspal/default.nix b/pkgs/development/python-modules/myfitnesspal/default.nix index 35d1c70a23a..923f639feb9 100644 --- a/pkgs/development/python-modules/myfitnesspal/default.nix +++ b/pkgs/development/python-modules/myfitnesspal/default.nix @@ -1,34 +1,67 @@ -{ lib, fetchPypi, buildPythonPackage -, blessed, keyring, keyrings-alt, lxml, measurement, python-dateutil, requests, six, rich -, pytestCheckHook, mock, nose }: +{ lib +, fetchPypi +, buildPythonPackage +, blessed +, keyring +, keyrings-alt +, lxml +, measurement +, python-dateutil +, requests +, six +, rich +, pytestCheckHook +, mock +, nose +}: # TODO: Define this package in "all-packages.nix" using "toPythonApplication". # This currently errors out, complaining about not being able to find "etree" from "lxml" even though "lxml" is defined in "propagatedBuildInputs". buildPythonPackage rec { pname = "myfitnesspal"; - version = "1.16.4"; + version = "1.16.5"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "44b31623fd71fedd891c3f66be3bc1caa6f1caf88076a75236ab74f8807f6ae5"; + sha256 = "sha256-v7lYaZLHxQs3/2uJnj+9y0xCXfPO1C38jLwzF7IMbb0="; }; - # Remove overly restrictive version constraints + propagatedBuildInputs = [ + blessed + keyring + keyrings-alt + lxml + measurement + python-dateutil + requests + six + rich + ]; + + checkInputs = [ + mock + nose + pytestCheckHook + ]; + postPatch = '' - sed -i 's/keyring>=.*/keyring/' requirements.txt - sed -i 's/keyrings.alt>=.*/keyrings.alt/' requirements.txt - sed -i 's/rich>=.*/rich/' requirements.txt + # Remove overly restrictive version constraints + sed -i -e "s/>=.*//" requirements.txt ''; - propagatedBuildInputs = [ blessed keyring keyrings-alt lxml measurement python-dateutil requests six rich ]; + disabledTests = [ + # Integration tests require an account to be set + "test_integration" + ]; - # Integration tests require an account to be set - disabledTests = [ "test_integration" ]; - checkInputs = [ pytestCheckHook mock nose ]; + pythonImportsCheck = [ + "myfitnesspal" + ]; meta = with lib; { - description = "Access your meal tracking data stored in MyFitnessPal programatically"; + description = "Python module to access meal tracking data stored in MyFitnessPal"; homepage = "https://github.com/coddingtonbear/python-myfitnesspal"; license = licenses.mit; maintainers = with maintainers; [ bhipple ]; diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index b40a95ded33..1cb5f1b7570 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -73,6 +73,12 @@ buildPythonPackage rec { "test_checkpoints_follow_file" ]; + disabledTestPaths = lib.optionals stdenv.isDarwin [ + # requires local networking + "notebook/auth/tests/test_login.py" + "notebook/bundler/tests/test_bundler_api.py" + ]; + # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 564fbca37ba..2c51e8c36d8 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, kernel, installShellFiles +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, kernel, installShellFiles , luajit, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc, elfutils, tbb, protobuf, grpc }: @@ -14,6 +14,19 @@ stdenv.mkDerivation rec { sha256 = "sha256-lYjMvxMIReANNwMr62u881Nugrs9piOaN3EmrvGzRns="; }; + patches = [ + # Fix pending upstream inclusion for ncurses-6.3 support: + # https://github.com/draios/sysdig/pull/1810 + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/draios/sysdig/commit/1e37fffe0337b8f8f8e0b5345db2f8631851c209.patch"; + sha256 = "sha256-T+yC6iXQ3MY+ub0c+Hv+cC18PV8YlAOKB6YB1Hdm7Yc="; + # change 'a/userspace/sinspui' for 'a/userspace/libsinsp' to follow upstream rename. + stripLen = 3; + extraPrefix = "userspace/libsinsp/"; + }) + ]; + nativeBuildInputs = [ cmake perl installShellFiles ]; buildInputs = [ luajit ncurses jsoncpp libb64 openssl curl jq gcc elfutils tbb protobuf grpc diff --git a/pkgs/tools/networking/goimapnotify/deps.nix b/pkgs/tools/networking/goimapnotify/deps.nix deleted file mode 100644 index fc377c50be4..00000000000 --- a/pkgs/tools/networking/goimapnotify/deps.nix +++ /dev/null @@ -1,66 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "github.com/emersion/go-imap"; - fetch = { - type = "git"; - url = "https://github.com/emersion/go-imap"; - rev = "b7db4a2bc5cc04fb568fb036a438da43ee9a9f78"; - sha256 = "1v5hp02k9rfdq7gqiydz575dw6a991pspynhxypv0fvgh1vgqs0s"; - }; - } - { - goPackagePath = "github.com/emersion/go-imap-idle"; - fetch = { - type = "git"; - url = "https://github.com/emersion/go-imap-idle"; - rev = "2af93776db6b042cc1116b0d0af00d7f58eea696"; - sha256 = "19dh8sryjr3a8f0bgwywiz2fqccxhf4j66sm0w1jkjzh131f3pr7"; - }; - } - { - goPackagePath = "github.com/emersion/go-sasl"; - fetch = { - type = "git"; - url = "https://github.com/emersion/go-sasl"; - rev = "7e096a0a6197b89989e8cc31016daa67c8c62051"; - sha256 = "0mr9nzi4wc3ck730zqfqwmy8wk7d90h80yvvivqnxyfyadqy48kd"; - }; - } - { - goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; - fetch = { - type = "git"; - url = "https://github.com/konsorten/go-windows-terminal-sequences"; - rev = "f55edac94c9bbba5d6182a4be46d86a2c9b5b50e"; - sha256 = "09mn209ika7ciy87xf2x31dq5fnqw39jidgaljvmqxwk7ff1hnx7"; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "8bdbc7bcc01dcbb8ec23dc8a28e332258d25251f"; - sha256 = "1m7ny9jkb98cxqhsp13xa5hnqh1s9f25x04q6arsala4zswsw33c"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "a129542de9ae0895210abff9c95d67a1f33cb93d"; - sha256 = "13p5q7s25rsvfkk8fcwf432j8djf7bjg7chs296rzlig4vqcdxi4"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "342b2e1fbaa52c93f31447ad2c6abc048c63e475"; - sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; - }; - } -] diff --git a/pkgs/tools/nix/statix/default.nix b/pkgs/tools/nix/statix/default.nix index d5fd2fd092b..4de3aa35677 100644 --- a/pkgs/tools/nix/statix/default.nix +++ b/pkgs/tools/nix/statix/default.nix @@ -4,16 +4,16 @@ rustPlatform.buildRustPackage rec { pname = "statix"; # also update version of the vim plugin in pkgs/misc/vim-plugins/overrides.nix # the version can be found in flake.nix of the source code - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "nerdypepper"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xFdHC7LulhDBWsbCcWeH90sR4iUhzQrShiW69/KHk0U="; + sha256 = "sha256-4hVEwm2xuuHFy38/EJLKjGuxTYCAcKRHHfFKLvqp+M0="; }; - cargoSha256 = "sha256-dzDgHROlwsqwQ6pk7lrwP0eV69595l0HvF7jHSe3N/g="; + cargoSha256 = "sha256-15C/ye8nYLtriBlqbf1ul41IFtShGY2LTX10z1/08Po="; buildFeatures = lib.optional withJson "json"; diff --git a/pkgs/tools/security/cosign/default.nix b/pkgs/tools/security/cosign/default.nix index c66b3a6426f..25f5527eb6b 100644 --- a/pkgs/tools/security/cosign/default.nix +++ b/pkgs/tools/security/cosign/default.nix @@ -1,14 +1,14 @@ -{ stdenv, lib, buildGoModule, fetchFromGitHub, pcsclite, pkg-config, installShellFiles, PCSC, pivKeySupport ? true }: +{ stdenv, lib, buildGoModule, fetchFromGitHub, pcsclite, pkg-config, installShellFiles, PCSC, pivKeySupport ? true, pkcs11Support ? true }: buildGoModule rec { pname = "cosign"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VKlM+bsK2Oj0UB4LF10pHEIJqXv6cAO5rtxnTogpfOk="; + sha256 = "sha256-K9ZORbccEH7KV0XHkio/fl/5kvUInRCvzFY4QOqrgfg="; }; buildInputs = lib.optional (stdenv.isLinux && pivKeySupport) (lib.getDev pcsclite) @@ -16,13 +16,13 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config installShellFiles ]; - vendorSha256 = "sha256-idMvvYeP5rAT6r9RPZ9S8K9KTpVYVq06ZKSBPxWA2ms="; + vendorSha256 = "sha256-958HDdd9o+paEHVvwWSFJGSIHuY63jf89rTw3QKJzxc="; excludedPackages = "\\(sample\\|webhook\\|help\\)"; - tags = lib.optionals pivKeySupport [ "pivkey" ]; + tags = [] ++ lib.optionals pivKeySupport [ "pivkey" ] ++ lib.optionals pkcs11Support [ "pkcs11key" ]; - ldflags = [ "-s" "-w" "-X github.com/sigstore/cosign/cmd/cosign/cli/options.GitVersion=v${version}" ]; + ldflags = [ "-s" "-w" "-X github.com/sigstore/cosign/pkg/version.GitVersion=v${version}" ]; postInstall = '' installShellCompletion --cmd cosign \ diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 1c8682e93bc..ec4fe42e00e 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "vault"; - version = "1.8.4"; + version = "1.9.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "sha256-t/BQu6nq0FcmqTc/vo3bTUbVNDqzePqlOMFkl4pD598="; + sha256 = "sha256-PQDxloDvdzdtMVUlT7exiXwcg6nalVc5Y4wYxFQMa08="; }; - vendorSha256 = "sha256-9eXDcuVm+N4nenotUtCvyp2qB5uPDwzGHk43Y4uTT14="; + vendorSha256 = "sha256-pMF6KUUaiyjVeRhSt7yE0yyFlW2k5JUCAYNFE0Kvraw="; subPackages = [ "." ]; @@ -38,7 +38,7 @@ buildGoModule rec { --prefix PATH ${lib.makeBinPath [ gawk glibc ]} ''; - passthru.tests.vault = nixosTests.vault; + passthru.tests = { inherit (nixosTests) vault vault-postgresql; }; meta = with lib; { homepage = "https://www.vaultproject.io/"; diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix index b67d63938c9..0fab9041a63 100644 --- a/pkgs/tools/security/vault/vault-bin.nix +++ b/pkgs/tools/security/vault/vault-bin.nix @@ -1,26 +1,30 @@ { lib, stdenv, fetchurl, unzip, makeWrapper, gawk, glibc }: let - version = "1.8.4"; + version = "1.9.0"; sources = let base = "https://releases.hashicorp.com/vault/${version}"; in { x86_64-linux = fetchurl { url = "${base}/vault_${version}_linux_amd64.zip"; - sha256 = "sha256-zrCRnIScIWJ8ocrgYPNhtvuX3PBLF9HX0dyZU/zY4yk="; + sha256 = "sha256-atiwnKcNXCgiyHG3vSDs3vto6dpMS5qmBiAAqb/xn3o="; }; i686-linux = fetchurl { url = "${base}/vault_${version}_linux_386.zip"; - sha256 = "0sh9q29b0bi5ap6nvll0ykxd5vf4wliksj31cmm4gw5vp90irvl3"; + sha256 = "sha256-ZqsWWyaZ7b7RjR999mvHe+f68w3+x5xwPB+EXseYaKk="; }; x86_64-darwin = fetchurl { url = "${base}/vault_${version}_darwin_amd64.zip"; - sha256 = "09nhfdw20g46fnrn82my7a59pfa81dxncxhiswmha3cdy8n0p6wb"; + sha256 = "sha256-PXK72di2SNAgyAqu1SimZNN3YLqWwMw9E2cagpN3b4Y="; + }; + aarch64-darwin = fetchurl { + url = "${base}/vault_${version}_darwin_arm64.zip"; + sha256 = "sha256-7OxGz3jqzvfC/y2vkTdhQ+IjmMSQ4XmSHecbJ/oM2EI="; }; aarch64-linux = fetchurl { url = "${base}/vault_${version}_linux_arm64.zip"; - sha256 = "01ra0xrgivf01ff87p0gqmi1flnac9y02x7jpv5j6a9czr1sqw1j"; + sha256 = "sha256-Yy7mdXXdEBl1u/KB95/bWaDdej9SSIOMQsk3KCEeR5s="; }; }; @@ -47,10 +51,12 @@ in stdenv.mkDerivation { runHook postInstall ''; + dontStrip = stdenv.isDarwin; + meta = with lib; { homepage = "https://www.vaultproject.io"; description = "A tool for managing secrets, this binary includes the UI"; - platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ]; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-darwin" "aarch64-linux" ]; license = licenses.mpl20; maintainers = with maintainers; teams.serokell.members ++ [ offline psyanticy Chili-Man ]; }; diff --git a/pkgs/tools/system/gdu/default.nix b/pkgs/tools/system/gdu/default.nix index d5bcdb6f080..e70e8226159 100644 --- a/pkgs/tools/system/gdu/default.nix +++ b/pkgs/tools/system/gdu/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gdu"; - version = "5.11.0"; + version = "5.12.0"; src = fetchFromGitHub { owner = "dundee"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GOZms7kYAWQ0VBr8p3RjsQvKXN+lkP9ytHta/Fgln0c="; + sha256 = "sha256-GcipzV6TgJLXY5RgzFssaInBFIFORKr6wcZB6fD16OY="; }; vendorSha256 = "0ls0pw1m6hy203cdkmp9847h2fmvc4hjkv5x2v6r7516cqbs25ac"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 946326d1979..89bf40c5887 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1217,6 +1217,8 @@ mapAliases ({ qqc2-breeze-style sddm-kcm systemsettings xdg-desktop-portal-kde + plasma-phone-components + plasma-nano ; inherit (plasma5Packages.thirdParty) plasma-applet-caffeine-plus diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 65418a5c547..c9a757f6e64 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3292,6 +3292,10 @@ with pkgs; maigret = callPackage ../tools/security/maigret { }; + maliit-framework = libsForQt5.callPackage ../applications/misc/maliit-framework { }; + + maliit-keyboard = libsForQt5.callPackage ../applications/misc/maliit-keyboard { }; + mapcidr = callPackage ../tools/misc/mapcidr { }; mapproxy = callPackage ../applications/misc/mapproxy { }; @@ -24033,6 +24037,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + ascii-image-converter = callPackage ../applications/graphics/ascii-image-converter { }; + artha = callPackage ../applications/misc/artha { }; atlassian-cli = callPackage ../applications/office/atlassian-cli { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c699d32b27c..18e7c72184f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4774,6 +4774,8 @@ in { mdit-py-plugins = callPackage ../development/python-modules/mdit-py-plugins { }; + mdurl = callPackage ../development/python-modules/mdurl { }; + MDP = callPackage ../development/python-modules/mdp { }; measurement = callPackage ../development/python-modules/measurement { }; |