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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2021-11-22 06:01:10 +00:00 committed by GitHub
commit cbcbfb4901
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 124 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/networking/instant-messengers/discord/base.nix
View File

@ -37,7 +37,7 @@ in stdenv.mkDerivation rec {
stdenv.cc.cc alsa-lib atk at-spi2-atk at-spi2-core cairo cups dbus expat fontconfig freetype
gdk-pixbuf glib gtk3 libnotify libX11 libXcomposite libuuid
libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender
libXtst nspr nss libxcb pango systemd libXScrnSaver
libXtst nspr nss libxcb pango libXScrnSaver
libappindicator-gtk3 libdbusmenu
];

2
pkgs/applications/video/mpv/wrapper.nix
View File

@ -79,6 +79,8 @@ let
rm "$out/Applications/mpv.app/Contents/MacOS/mpv"
makeWrapper "${mpv}/Applications/mpv.app/Contents/MacOS/mpv" "$out/Applications/mpv.app/Contents/MacOS/mpv" ${mostMakeWrapperArgs}
'';
meta.mainProgram = "mpv";
};
in
lib.makeOverridable wrapper

6
pkgs/applications/virtualization/qemu/default.nix
View File

@ -112,6 +112,12 @@ stdenv.mkDerivation rec {
url = "https://gitlab.com/qemu-project/qemu/-/commit/13a028336f2c05e7ff47dfdaf30dfac7f4883e80.patch";
sha256 = "sha256-23xVixVl+JDBNdhe5j5WY8CB4MsnUo+sjrkAkG+JS6M=";
})
# Fixes managedsave (snapshot creation) with QXL video device. Remove with next release.
(fetchpatch {
name = "qxl-fix-pre-save-logic.patch";
url = "https://gitlab.com/qemu-project/qemu/-/commit/eb94846280df3f1e2a91b6179fc05f9890b7e384.patch";
sha256 = "sha256-p31fd47RTSw928DOMrubQQybnzDAGm23z4Yhe+hGJQ8=";
})
] ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch
++ lib.optionals stdenv.hostPlatform.isMusl [
./sigrtminmax.patch

4
pkgs/desktops/gnome/extensions/default.nix
View File

@ -55,8 +55,6 @@ let
];
in rec {
inherit buildShellExtension;
gnome38Extensions = mapUuidNames (produceExtensionsList "38");
gnome40Extensions = mapUuidNames (produceExtensionsList "40");
gnome41Extensions = mapUuidNames (produceExtensionsList "41");
@ -79,6 +77,8 @@ in rec {
mediaplayer = throw "gnomeExtensions.mediaplayer deprecated since 2019-09-23: retired upstream https://github.com/JasonLG1979/gnome-shell-extensions-mediaplayer/blob/master/README.md";
remove-dropdown-arrows = throw "gnomeExtensions.remove-dropdown-arrows removed since 2021-05-25: The extensions has not seen an update sine GNOME 3.34. Furthermore, the functionality it provides is obsolete as of GNOME 40.";
})
# Export buildShellExtension function
(extensions: extensions // { inherit buildShellExtension; })
# Make the set "public"
lib.recurseIntoAttrs
];

20
pkgs/development/libraries/physics/cernlib/default.nix
View File

@ -35,18 +35,30 @@ stdenv.mkDerivation rec {
export PATH=$PATH:$CERN_ROOT/bin
'';
FFLAGS = lib.optionals (lib.versionAtLeast gfortran.version "10.0.0") [
# Fix https://github.com/vmc-project/geant3/issues/17
"-fallow-invalid-boz"
# Fix for gfortran 10
"-fallow-argument-mismatch"
];
makeFlags = [
"FORTRANOPTIONS=$(FFLAGS)"
];
buildPhase = ''
cd $CERN_ROOT
mkdir -p build bin lib
cd $CERN_ROOT/build
$CVSCOSRC/config/imake_boot
make -j $NIX_BUILD_CORES bin/kuipc
make -j $NIX_BUILD_CORES scripts/Makefile
make -j $NIX_BUILD_CORES $makeFlags bin/kuipc
make -j $NIX_BUILD_CORES $makeFlags scripts/Makefile
pushd scripts
make -j $NIX_BUILD_CORES install.bin
make -j $NIX_BUILD_CORES $makeFlags install.bin
popd
make -j $NIX_BUILD_CORES
make -j $NIX_BUILD_CORES $makeFlags
'';
installPhase = ''

1
pkgs/development/python-modules/tensorflow/default.nix
View File

@ -344,6 +344,7 @@ let
license = licenses.asl20;
maintainers = with maintainers; [ jyp abbradar ];
platforms = with platforms; linux ++ darwin;
timeout = 86400; # 24 hours, needed for darwin
broken = !(xlaSupport -> cudaSupport);
};
};

4
pkgs/misc/vscode-extensions/default.nix
View File

@ -1516,8 +1516,8 @@ let
mktplcRef = {
name = "even-better-toml";
publisher = "tamasfe";
version = "0.9.3";
sha256 = "16x2y58hkankazpwm93j8lqdn3mala7iayck548kki9zx4qrhhck";
version = "0.14.2";
sha256 = "17djwa2bnjfga21nvyz8wwmgnjllr4a7nvrsqvzm02hzlpwaskcl";
};
meta = {
license = lib.licenses.mit;

2
pkgs/os-specific/linux/kernel/generic.nix
View File

@ -203,8 +203,6 @@ let
features = kernelFeatures;
inherit commonStructuredConfig structuredExtraConfig extraMakeFlags isZen isHardened isLibre modDirVersion;
isXen = lib.warn "The isXen attribute is deprecated. All Nixpkgs kernels that support it now have Xen enabled." true;
kernelOlder = lib.versionOlder version;
kernelAtLeast = lib.versionAtLeast version;
passthru = kernel.passthru // (removeAttrs passthru [ "passthru" ]);
tests = let
overridableKernel = finalKernel // {

7
pkgs/os-specific/linux/kernel/manual-config.nix
View File

@ -97,13 +97,14 @@ let
(isModular || (config.isDisabled "FIRMWARE_IN_KERNEL")) &&
(lib.versionOlder version "4.14");
in (optionalAttrs isModular { outputs = [ "out" "dev" ]; }) // {
passthru = {
passthru = rec {
inherit version modDirVersion config kernelPatches configfile
moduleBuildDependencies stdenv;
inherit isZen isHardened isLibre;
isXen = lib.warn "The isXen attribute is deprecated. All Nixpkgs kernels that support it now have Xen enabled." true;
kernelOlder = lib.versionOlder version;
kernelAtLeast = lib.versionAtLeast version;
baseVersion = lib.head (lib.splitString "-rc" version);
kernelOlder = lib.versionOlder baseVersion;
kernelAtLeast = lib.versionAtLeast baseVersion;
};
inherit src;

6
pkgs/servers/dendrite/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "matrix-dendrite";
version = "0.5.0";
version = "0.5.1";
src = fetchFromGitHub {
owner = "matrix-org";
repo = "dendrite";
rev = "v${version}";
sha256 = "iCxfsIOZqPQjY0u2Zw3PCe0IJDczqDjcTUA3U5zXbgM=";
sha256 = "1HCVWSxXOR2syN+dLDSvrNzYHTj/vXZRHkXhU0f3m1k=";
};
vendorSha256 = "sha256-XS1B6Nl5zGevxE1SohpoTwT/bXn5udYV5ANVFn7eTyA=";
vendorSha256 = "sha256-RqEt0RAsKWKy6NvMzulqY56nZ7fIxgJkgN/WpEZ3F2I=";
passthru.tests = {
inherit (nixosTests) dendrite;

4
pkgs/servers/reproxy/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "reproxy";
version = "0.9.0";
version = "0.11.0";
src = fetchFromGitHub {
owner = "umputun";
repo = pname;
rev = "v${version}";
hash = "sha256-z10KfDwIwitiR6ei1xV9//zhH7DLTow1giEYyjh8FIg=";
hash = "sha256-3kpGeG60WSpcIqVLw437gkDT8XLsDyhGL8/sEnhTgBw=";
};
postPatch = ''

6
pkgs/tools/backup/kopia/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kopia";
version = "0.9.5";
version = "0.9.6";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-1HCpUfK8y4BaBluThpRVeXTPgMUym6R+WXCO+2pRNjc=";
sha256 = "sha256-lfzlYpkAGGY7fs9PYPSg2XYgW92WV1/zh2oRz4Qw7vs=";
};
vendorSha256 = "sha256-tYu1T4oHkvj4QOS/e/6N9IjMlxrGKosQ78DVgAyh6/Q=";
vendorSha256 = "sha256-xa6B3gGgJc7E8VCfpRXlE8Jw3ylNnfynK+QEiqy2yF4=";
doCheck = false;

69
pkgs/tools/misc/parquet-tools/default.nix Normal file
View File

@ -0,0 +1,69 @@
{ lib
, fetchFromGitHub
, fetchpatch
, python3Packages
}:
with python3Packages;
buildPythonApplication rec {
pname = "parquet-tools";
version = "0.2.9";
disabled = pythonOlder "3.8";
format = "pyproject";
src = fetchFromGitHub {
owner = "ktrueda";
repo = "parquet-tools";
rev = version;
sha256 = "0aw0x7lhagp4dwis09fsizr7zbhdpliav0ns5ll5qny7x4m6rkfy";
};
patches = [
(fetchpatch {
url = "https://github.com/ktrueda/parquet-tools/commit/1c70a07e1c9f17c8890d23aad3ded5dd6c706cb3.patch";
sha256 = "08j1prdqj8ksw8gwiyj7ivshk82ahmywbzmywclw52nlnniig0sa";
})
];
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'thrift = "^0.13.0"' 'thrift = "*"' \
--replace 'halo = "^0.0.29"' 'halo = "*"'
substituteInPlace tests/test_inspect.py \
--replace "parquet-cpp-arrow version 5.0.0" "parquet-cpp-arrow version 6.0.0" \
--replace "serialized_size: 2222" "serialized_size: 2221"
'';
nativeBuildInputs = [ poetry-core ];
propagatedBuildInputs = [
boto3
colorama
halo
pandas
pyarrow
tabulate
thrift
];
checkInputs = [
pytestCheckHook
moto
pytest-mock
];
disabledTests = [
# these tests try to read python code as parquet and fail
"test_local_wildcard"
"test_local_and_s3_wildcard_files"
];
meta = with lib; {
description = "A CLI tool for parquet files";
homepage = "https://github.com/ktrueda/parquet-tools";
license = licenses.mit;
maintainers = with maintainers; [ cpcloud ];
};
}

2
pkgs/top-level/all-packages.nix
View File

@ -1841,6 +1841,8 @@ with pkgs;
pacparser = callPackage ../tools/networking/pacparser { };
parquet-tools = callPackage ../tools/misc/parquet-tools { };
pass = callPackage ../tools/security/pass { };
passphrase2pgp = callPackage ../tools/security/passphrase2pgp { };

17
pkgs/top-level/linux-kernels.nix
View File

@ -173,12 +173,17 @@ in {
];
};
linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix {
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
];
};
linux_testing = let
testing = callPackage ../os-specific/linux/kernel/linux-testing.nix {
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
];
};
latest = packageAliases.linux_latest.kernel;
in if latest.kernelAtLeast testing.baseVersion
then latest
else testing;
linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix rec {
kernel = linux_5_15;