diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-03-12 06:01:08 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-12 06:01:08 +0000 |
commit | d599106fc4450fa757f42cf39e55dcd2ed7c7d1d (patch) | |
tree | cc0deb8e6d181e4f0509e4336258ed68fe90cd1b /pkgs | |
parent | be8c1707399fb5d8b5de0531d09661eded9cf0a1 (diff) | |
parent | 12769bc7e1098fc781f70c40f62c55d4673329fa (diff) | |
download | nixpkgs-d599106fc4450fa757f42cf39e55dcd2ed7c7d1d.tar nixpkgs-d599106fc4450fa757f42cf39e55dcd2ed7c7d1d.tar.gz nixpkgs-d599106fc4450fa757f42cf39e55dcd2ed7c7d1d.tar.bz2 nixpkgs-d599106fc4450fa757f42cf39e55dcd2ed7c7d1d.tar.lz nixpkgs-d599106fc4450fa757f42cf39e55dcd2ed7c7d1d.tar.xz nixpkgs-d599106fc4450fa757f42cf39e55dcd2ed7c7d1d.tar.zst nixpkgs-d599106fc4450fa757f42cf39e55dcd2ed7c7d1d.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs')
15 files changed, 45 insertions, 43 deletions
diff --git a/pkgs/applications/version-management/commitizen/default.nix b/pkgs/applications/version-management/commitizen/default.nix index 0aa3f0d02ab..38aca7350a6 100644 --- a/pkgs/applications/version-management/commitizen/default.nix +++ b/pkgs/applications/version-management/commitizen/default.nix @@ -40,7 +40,7 @@ buildPythonApplication rec { owner = "commitizen-tools"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZFKUG8dE1hpWPGitdQlYeBSzWn3LPR7VGWsuq1Le5OQ="; + sha256 = "sha256-7S676bpSrlAqpbgDj9nAo0WjeitbbHoYc693MJm35Js="; deepClone = true; }; diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index fb62a0d2e11..4fd30b36752 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -1,22 +1,21 @@ -{ lib, fetchurl, python3Packages, intltool, file -, wrapGAppsHook, gtk-vnc, vte, avahi, dconf -, gobject-introspection, libvirt-glib, system-libvirt -, gsettings-desktop-schemas, libosinfo, gnome -, gtksourceview4, docutils +{ lib, fetchFromGitHub, python3, intltool, file, wrapGAppsHook, gtk-vnc +, vte, avahi, dconf, gobject-introspection, libvirt-glib, system-libvirt +, gsettings-desktop-schemas, libosinfo, gnome, gtksourceview4, docutils, cpio +, e2fsprogs, findutils, gzip, cdrtools , spiceSupport ? true, spice-gtk ? null -, cpio, e2fsprogs, findutils, gzip -, cdrtools }: with lib; -python3Packages.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "virt-manager"; - version = "3.2.0"; + version = "4.0.0"; - src = fetchurl { - url = "https://releases.pagure.org/virt-manager/${pname}-${version}.tar.gz"; - sha256 = "11kvpzcmyir91qz0dsnk7748jbb4wr8mrc744w117qc91pcy6vrb"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + hash = "sha256-3ycXNBuf91kI2cJCRw0ZzaWkaIVwb/lmkOKeHNwpH9Y="; }; nativeBuildInputs = [ @@ -32,7 +31,7 @@ python3Packages.buildPythonApplication rec { gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943 ] ++ optional spiceSupport spice-gtk; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = with python3.pkgs; [ pygobject3 ipaddress libvirt libxml2 requests cdrtools ]; @@ -42,14 +41,17 @@ python3Packages.buildPythonApplication rec { ''; postConfigure = '' - ${python3Packages.python.interpreter} setup.py configure --prefix=$out + ${python3.interpreter} setup.py configure --prefix=$out ''; - setupPyGlobalFlags = [ "--no-update-icon-cache" ]; + setupPyGlobalFlags = [ "--no-update-icon-cache" "--no-compile-schemas" ]; dontWrapGApps = true; preFixup = '' + mkdir -p $out/share/glib-2.0/schemas + cp $src/data/*.gschema.xml $out/share/glib-2.0/schemas/ + gappsWrapperArgs+=(--set PYTHONPATH "$PYTHONPATH") # these are called from virt-install in initrdinject.py gappsWrapperArgs+=(--prefix PATH : "${makeBinPath [ cpio e2fsprogs file findutils gzip ]}") @@ -57,7 +59,7 @@ python3Packages.buildPythonApplication rec { makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; - checkInputs = with python3Packages; [ cpio cdrtools pytestCheckHook ]; + checkInputs = with python3.pkgs; [ cpio cdrtools pytestCheckHook ]; disabledTestPaths = [ "tests/test_cli.py" diff --git a/pkgs/tools/admin/fits-cloudctl/default.nix b/pkgs/tools/admin/fits-cloudctl/default.nix index f712c72fe08..b506d1d678f 100644 --- a/pkgs/tools/admin/fits-cloudctl/default.nix +++ b/pkgs/tools/admin/fits-cloudctl/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "fits-cloudctl"; - version = "0.10.10"; + version = "0.10.11"; src = fetchFromGitHub { owner = "fi-ts"; repo = "cloudctl"; rev = "v${version}"; - sha256 = "sha256-US3Wvr6uBwsaIqjsbWeZtYucXVybMjKu8AuPYvykCvA="; + sha256 = "sha256-hGKnQk2OPpHsjbRh/xx3MidbUMio6tYn+oJB0t1a/yM="; }; vendorSha256 = "sha256-f35Asf9l6ZfixpjMGzesTsxmANreilMxH2CULMH3b2o="; diff --git a/pkgs/tools/inputmethods/fcitx5/default.nix b/pkgs/tools/inputmethods/fcitx5/default.nix index f00da6045a3..123d634d65f 100644 --- a/pkgs/tools/inputmethods/fcitx5/default.nix +++ b/pkgs/tools/inputmethods/fcitx5/default.nix @@ -41,13 +41,13 @@ let in stdenv.mkDerivation rec { pname = "fcitx5"; - version = "5.0.14"; + version = "5.0.15"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-Trpye+jTu+l8ieUK6IX+ZqNe4H2DvoJ10juiMkEGRKM="; + sha256 = "sha256-+9MmYyMP6oqtToTsvcCMlNnKU0ZZtHYtI4YFXb7DuXU="; }; prePatch = '' diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix index 7d3ef954b27..adc46f3cb30 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-chewing"; - version = "5.0.9"; + version = "5.0.10"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-wPfod0BNvNy1gwSJyu7N0sS61StnmXLrMNFgmHk9A0M="; + sha256 = "sha256-KZ3RZ/1Pt+/eNjJ8KSSgwl1MuB1OdGGb0Kwz6hpkxPY="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix index 7f75748df57..85ce543ecdf 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix @@ -31,13 +31,13 @@ in mkDerivation rec { pname = "fcitx5-chinese-addons"; - version = "5.0.11"; + version = "5.0.12"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-PBKTc6yxCaLYZxfR7158rTkR7GsDCapjCKBuLxNu4dU="; + sha256 = "sha256-0+jKBA1IaeqV6epnJBgGwnDdAUxdMH6RyOKGmsw0M/o="; }; cmakeFlags = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix index 42a7ffd0100..b7b74de4358 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix @@ -19,13 +19,13 @@ mkDerivation rec { pname = "fcitx5-configtool"; - version = "5.0.11"; + version = "5.0.12"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-8Yj4ueLyfPlvjI3HLH5qudY5BEQaBkM5rNgqjH1ihV8="; + sha256 = "sha256-Xjk/Z+1V6Az85N5I+Icoj0kOPJVL7hxyQvqlsp50Ybk="; }; cmakeFlags = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix index eaec4463ca5..194513dddee 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-gtk"; - version = "5.0.12"; + version = "5.0.13"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-wSYYVQMuydtxMQ/v9b6bBMesyfKlsqUqpqf/y74Q4zc="; + sha256 = "sha256-2kY38XwQYEAtJ3KtSsfkySY79arsFCzXsCAVpE8TpSk="; }; cmakeFlags = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix index 2357c73b764..7a612f6810d 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-hangul"; - version = "5.0.7"; + version = "5.0.8"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-vjKQ0h85gvlE+inHuzkIBLgluwA6c/XADtyMi6nQNc8="; + sha256 = "sha256-b8vxPzTmvmvWkO5H/yf+Kg9xPQ/53tR9jQsD11KjzJw="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix index 8f53508a043..2c59c2539af 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-lua"; - version = "5.0.6"; + version = "5.0.7"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-6znDtU/yVAJByhCanW7KVg5Tk615aCLbFbxDMESVOlY="; + sha256 = "sha256-ZZwPjELIJczF3AJxQqJcwA6J8vGuPdit/0dEHS+g7J0="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix index 24e06028a45..a300892e5df 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "fcitx5-qt"; - version = "5.0.10"; + version = "5.0.11"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-KSnbwXMyAnya0Os/xrmjzK/wD6/dpM48rs1nS9SL5hs="; + sha256 = "sha256-T3gGErvB1DtEdHSC1oKzmttTLBBn3jXcvZFWnpoPz4E="; }; preConfigure = '' diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix index ecbe4d5c67b..3743d6cb9fc 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-rime"; - version = "5.0.11"; + version = "5.0.12"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-kEqooOSLMp2LF911M1q67GYRGx421V6iExXOQk1pcl0="; + sha256 = "sha256-8ETSRBTznd4AKzYbSW/zIMZXV+yuHXLhfTJV3DJ2ahc="; }; cmakeFlags = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix index fd91a9bafb4..7531fa074c1 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-table-extra"; - version = "5.0.8"; + version = "5.0.9"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-8ad7A6MHkVfQEVMrbuAv2sJlc7t3rlz4EFqaMe51YSw="; + sha256 = "sha256-FEpBpEfq9qRLQ+j+313ua3zhZnphdaYy9jPKyb8oUG8="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix index dc601aca806..d723f613136 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-table-other"; - version = "5.0.7"; + version = "5.0.8"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-XpQ/5OLNEcJTu1LvGBM6arGZrBl6XSIWx9MDKH9WIt4="; + sha256 = "sha256-aCZqcPqokkxBWx9kPBfxbslW1RZBIoZ63e7fPItl5yg="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix index d9517ce214d..6401785e97b 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-unikey"; - version = "5.0.8"; + version = "5.0.9"; src = fetchFromGitHub { owner = "fcitx"; repo = "fcitx5-unikey"; rev = version; - sha256 = "sha256-UdhTIVRLEqzxh9aafqwLhA8EOKiO/tD5QksdVd0rvqI="; + sha256 = "sha256-lsWMQygIdHcEuHCEvi5d0PGI1jJ42C+9ji/w0L/eadM="; }; nativeBuildInputs = [ cmake extra-cmake-modules wrapQtAppsHook ]; |