JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2022-03-12 06:01:40 +00:00 committed by GitHub
commit 7c0802bf0d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 45 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/version-management/commitizen/default.nix
View File

@ -40,7 +40,7 @@ buildPythonApplication rec {
owner = "commitizen-tools";
repo = pname;
rev = "v${version}";
sha256 = "sha256-ZFKUG8dE1hpWPGitdQlYeBSzWn3LPR7VGWsuq1Le5OQ=";
sha256 = "sha256-7S676bpSrlAqpbgDj9nAo0WjeitbbHoYc693MJm35Js=";
deepClone = true;
};

34
pkgs/applications/virtualization/virt-manager/default.nix
View File

@ -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"

4
pkgs/tools/admin/fits-cloudctl/default.nix
View File

@ -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=";

4
pkgs/tools/inputmethods/fcitx5/default.nix
View File

@ -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 = ''

4
pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix
View File

@ -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 = [

4
pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix
View File

@ -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 = [

4
pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix
View File

@ -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 = [

4
pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix
View File

@ -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 = [

4
pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix
View File

@ -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 = [

4
pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix
View File

@ -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 = [

4
pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix
View File

@ -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 = ''

4
pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix
View File

@ -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 = [

4
pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix
View File

@ -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 = [

4
pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix
View File

@ -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 = [

4
pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix
View File

@ -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 ];