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] 2021-06-29 12:04:33 +00:00 committed by GitHub
commit e939b277e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 227 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/networking/browsers/chromium/common.nix
View File

@ -175,6 +175,18 @@ let
sha256 = "1bxdhxmiy6h4acq26lq43x2mxx6rawmfmlgsh5j7w8kyhkw5af0c";
revert = true;
})
# To fix build errors with the older system FFmpeg:
(githubPatch {
# unbundle: add libavcodec/packet.h to shim headers
commit = "e4d228ec30607b06bf3fed77497abef89c29966a";
sha256 = "02jg2bdmgjcpmk6alb72jc93wy3nf2fpa72hb4aarq337i2mwn4v";
})
(githubPatch {
# Roll src/third_party/ffmpeg/ 7e1d53a09..cf7ee6598 (1000 commits)
commit = "3ec3b2992238d4b4764f99f04605e154688c7990";
sha256 = "1fwb154s5qcis490rvcvm14zrmaj59g5lg9zg8ada36vw9hycbrf";
revert = true;
})
];
postPatch = ''

4
pkgs/applications/networking/browsers/qutebrowser/default.nix
View File

@ -31,12 +31,12 @@ let
in mkDerivationWith python3Packages.buildPythonApplication rec {
pname = "qutebrowser";
version = "2.2.3";
version = "2.3.0";
# the release tarballs are different from the git checkout!
src = fetchurl {
url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz";
sha256 = "sha256-BoP168jxj94nvkrcgC83fPw/TPRsI2PbCooqzWNF62I=";
sha256 = "09fz6rd0laisq7pqf9nrllcx58yb129fc05kdk45zrwwggq03b8h";
};
# Needs tox

5
pkgs/applications/radio/gnuradio/3.8.nix
View File

@ -42,14 +42,14 @@
, versionAttr ? {
major = "3.8";
minor = "3";
patch = "0";
patch = "1";
}
# We use our build of volk and not the one bundled with the release
, fetchSubmodules ? false
}:
let
sourceSha256 = "0lwbj3slhc8bjjvfw7yz45if21hajydgy2vsjvj2barzmhfb37fd";
sourceSha256 = "0vd39azp8n576dbqsanax7bgsnxwc80riaxid2ihxs4xzyjmbw9r";
featuresInfo = {
# Needed always
basic = {
@ -242,6 +242,7 @@ stdenv.mkDerivation rec {
# From some reason, if these are not set, libcodec2 and gsm are not
# detected properly. The issue is reported upstream:
# https://github.com/gnuradio/gnuradio/issues/4278
# The above issue was fixed for GR3.9 without a backporting patch.
#
# NOTE: qradiolink needs libcodec2 to be detected in
# order to build, see https://github.com/qradiolink/qradiolink/issues/67

28
pkgs/applications/radio/gnuradio/default.nix
View File

@ -22,6 +22,7 @@
, uhd
, SDL
, gsl
, soapysdr
, libsodium
, libsndfile
, libunwind
@ -44,14 +45,14 @@
, pname ? "gnuradio"
, versionAttr ? {
major = "3.9";
minor = "1";
minor = "2";
patch = "0";
}
, fetchSubmodules ? false
}:
let
sourceSha256 = "0zydmrr3gkaqiv4jv8f42awrfzs177bqb349q34rnr6j3d32z2vp";
sourceSha256 = "01wyqazrpphmb0fl69j93k0w4vm4d1l4177m1fyg7qx8hzia0aaq";
featuresInfo = {
# Needed always
basic = {
@ -205,6 +206,12 @@ let
gr-network = {
cmakeEnableFlag = "GR_NETWORK";
};
gr-soapy = {
cmakeEnableFlag = "GR_SOAPY";
runtime = [
soapysdr
];
};
};
shared = (import ./shared.nix {
inherit
@ -233,6 +240,7 @@ stdenv.mkDerivation rec {
src
nativeBuildInputs
buildInputs
cmakeFlags
disallowedReferences
stripDebugList
doCheck
@ -248,25 +256,9 @@ stdenv.mkDerivation rec {
} // lib.optionalAttrs (hasFeature "gr-qtgui" features) {
inherit (libsForQt5) qwt;
};
cmakeFlags = shared.cmakeFlags
# From some reason, if these are not set, libcodec2 and gsm are not
# detected properly.
++ lib.optionals (hasFeature "gr-vocoder" features) [
"-DLIBCODEC2_FOUND=TRUE"
"-DLIBCODEC2_LIBRARIES=${codec2}/lib/libcodec2.so"
"-DLIBCODEC2_INCLUDE_DIRS=${codec2}/include"
"-DLIBCODEC2_HAS_FREEDV_API=ON"
"-DLIBGSM_FOUND=TRUE"
"-DLIBGSM_LIBRARIES=${gsm}/lib/libgsm.so"
"-DLIBGSM_INCLUDE_DIRS=${gsm}/include/gsm"
]
;
postInstall = shared.postInstall
# This is the only python reference worth removing, if needed.
# Even if python support is enabled, and we don't care about this
# reference, pybind's path is not properly set. See:
# https://github.com/gnuradio/gnuradio/issues/4380
+ lib.optionalString (!hasFeature "python-support" features) ''
${removeReferencesTo}/bin/remove-references-to -t ${python} $out/lib/cmake/gnuradio/GnuradioConfig.cmake
${removeReferencesTo}/bin/remove-references-to -t ${python} $(readlink -f $out/lib/libgnuradio-runtime.so)

8
pkgs/applications/science/misc/root/default.nix
View File

@ -2,7 +2,7 @@
, libX11, libXpm, libXft, libXext, libGLU, libGL, libxml2, lz4, xz, pcre, nlohmann_json
, pkg-config, python, xxHash, zlib, zstd
, libAfterImage, giflib, libjpeg, libtiff, libpng
, Cocoa, OpenGL, noSplash ? false }:
, Cocoa, CoreSymbolication, OpenGL, noSplash ? false }:
stdenv.mkDerivation rec {
pname = "root";
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper cmake pkg-config git ];
buildInputs = [ ftgl gl2ps glew pcre zlib zstd libxml2 lz4 xz gsl xxHash libAfterImage giflib libjpeg libtiff libpng nlohmann_json python.pkgs.numpy ]
++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ]
++ lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ]
++ lib.optionals (stdenv.isDarwin) [ Cocoa CoreSymbolication OpenGL ]
;
patches = [
@ -38,6 +38,10 @@ stdenv.mkDerivation rec {
patchShebangs build/unix/
'' + lib.optionalString noSplash ''
substituteInPlace rootx/src/rootx.cxx --replace "gNoLogo = false" "gNoLogo = true"
'' + lib.optionalString stdenv.isDarwin ''
# Eliminate impure reference to /System/Library/PrivateFrameworks
substituteInPlace core/CMakeLists.txt \
--replace "-F/System/Library/PrivateFrameworks" ""
'';
cmakeFlags = [

46
pkgs/development/coq-modules/semantics/default.nix Normal file
View File

@ -0,0 +1,46 @@
{ lib, mkCoqDerivation, coq, version ? null }:
with lib;
mkCoqDerivation rec {
pname = "semantics";
owner = "coq-community";
releaseRev = v: "v${v}";
release."8.13.0".sha256 = "sha256-8bDr/Ovl6s8BFaRcHeS5H33/K/pYdeKfSN+krVuKulQ=";
release."8.11.1".sha256 = "sha256-jTPgcXSNn1G2mMDC7ocFcmqs8svB7Yo1emXP15iuxiU=";
release."8.9.0".sha256 = "sha256-UBsvzlDEZsZsVkbUI0GbFEhpxnnLCiaqlqDyWVC5I6s=";
release."8.8.0".sha256 = "sha256-k2nQyNw9KT3wY7bGy8KGILF44sLxkBYqdFpzFE9fgyw=";
release."8.7.0".sha256 = "sha256-k2nQyNw9KT3wY7bGy8KGILF44sLxkBYqdFpzFE9fgyw=";
release."8.6.0".sha256 = "sha256-GltkGQ3tJqUPAbdDkqqvKLLhMOap50XvGaCkjshiNdY=";
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = isGe "8.13"; out = "8.13.0"; }
{ case = "8.11"; out = "8.11.1"; }
{ case = "8.9"; out = "8.9.0"; }
{ case = "8.8"; out = "8.8.0"; }
{ case = "8.7"; out = "8.7.0"; }
{ case = "8.6"; out = "8.6.0"; }
] null;
mlPlugin = true;
extraBuildInputs = (with coq.ocamlPackages; [ num ocamlbuild ]);
postPatch = ''
for p in Make Makefile.coq.local
do
substituteInPlace $p --replace "-libs nums" "-use-ocamlfind -package num" || true
done
'';
meta = {
description = "A survey of programming language semantics styles in Coq";
longDescription = ''
A survey of semantics styles in Coq, from natural semantics through
structural operational, axiomatic, and denotational semantics, to
abstract interpretation
'';
maintainers = with maintainers; [ siraben ];
license = licenses.mit;
};
}

4
pkgs/development/libraries/intel-gmmlib/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "intel-gmmlib";
version = "21.1.3";
version = "21.2.1";
src = fetchFromGitHub {
owner = "intel";
repo = "gmmlib";
rev = "${pname}-${version}";
sha256 = "05vcr2rv6l38j7rv34mvcvzpgc2gjmvsb73wyprgdj71mcwrksyq";
sha256 = "1icnxq4sqhi11c82kg0hnavk3gvbwgw2fshc7a7nb6w1wdiibj5n";
};
nativeBuildInputs = [ cmake ];

30
pkgs/development/libraries/openmpi/default.nix
View File

@ -13,20 +13,21 @@
# Enable libfabric support (necessary for Omnipath networks) on x86_64 linux
, fabricSupport ? stdenv.isLinux && stdenv.isx86_64
# Enable Fortran support
, fortranSupport ? true
}:
assert !cudaSupport || cudatoolkit != null;
let
version = "4.1.1";
cudatoolkit_joined = symlinkJoin {
name = "${cudatoolkit.name}-unsplit";
paths = [ cudatoolkit.out cudatoolkit.lib ];
};
in stdenv.mkDerivation rec {
pname = "openmpi";
inherit version;
version = "4.1.1";
src = with lib.versions; fetchurl {
url = "https://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${pname}-${version}.tar.bz2";
@ -44,17 +45,19 @@ in stdenv.mkDerivation rec {
find -name "Makefile.in" -exec sed -i "s/\`date\`/$ts/" \{} \;
'';
buildInputs = with stdenv; [ gfortran zlib ]
++ lib.optionals isLinux [ libnl numactl pmix ucx ]
buildInputs = [ zlib ]
++ lib.optionals fortranSupport [ gfortran ]
++ lib.optionals stdenv.isLinux [ libnl numactl pmix ucx ]
++ lib.optionals cudaSupport [ cudatoolkit ]
++ [ libevent hwloc ]
++ lib.optional (isLinux || isFreeBSD) rdma-core
++ lib.optional (stdenv.isLinux || stdenv.isFreeBSD) rdma-core
++ lib.optional fabricSupport [ libpsm2 libfabric ];
nativeBuildInputs = [ perl ];
configureFlags = with stdenv; lib.optional (!cudaSupport) "--disable-mca-dso"
++ lib.optionals isLinux [
configureFlags = lib.optional (!cudaSupport) "--disable-mca-dso"
++ lib.optional (!fortranSupport) "--disable-mpi-fortran"
++ lib.optionals stdenv.isLinux [
"--with-libnl=${libnl.dev}"
"--with-pmix=${pmix}"
"--with-pmix-libdir=${pmix}/lib"
@ -70,6 +73,16 @@ in stdenv.mkDerivation rec {
enableParallelBuilding = true;
# disable stackprotector on aarch64-darwin for now
# https://github.com/NixOS/nixpkgs/issues/127608
#
# build error:
#
# /private/tmp/nix-build-openmpi-4.1.1.drv-0/ccg7QqR8.s:13:15: error: index must be an integer in range [-256, 255].
# ldr x2, [x2, ___stack_chk_guard];momd
#
hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ];
postInstall = ''
rm -f $out/lib/*.la
'';
@ -86,6 +99,7 @@ in stdenv.mkDerivation rec {
sed -i 's:compiler=.*:compiler=${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}c++:' \
$out/share/openmpi/mpic++-wrapper-data.txt
'' + lib.optionalString fortranSupport ''
sed -i 's:compiler=.*:compiler=${gfortran}/bin/${gfortran.targetPrefix}gfortran:' \
$out/share/openmpi/mpifort-wrapper-data.txt

6
pkgs/development/ocaml-modules/ppxlib/default.nix
View File

@ -2,7 +2,7 @@
, version ?
if lib.versionAtLeast ocaml.version "4.07"
then if lib.versionAtLeast ocaml.version "4.08"
then "0.22.0" else "0.15.0" else "0.13.0"
then "0.22.2" else "0.15.0" else "0.13.0"
, ocaml-compiler-libs, ocaml-migrate-parsetree, ppx_derivers, stdio
, stdlib-shims, ocaml-migrate-parsetree-2
}:
@ -34,6 +34,10 @@ let param = {
sha256 = "0kf7lgcwygf6zlx7rwddqpqvasa6v7xiq0bqal8vxlib6lpg074q";
min_version = "4.07";
};
"0.22.2" = {
sha256 = "0fysjqcpv281n52wl3h0dy2lzf9d61wdzk90ldv3p63a4i3mr1j2";
min_version = "4.07";
};
}."${version}"; in
if param ? max_version && lib.versionAtLeast ocaml.version param.max_version

68
pkgs/development/python-modules/python-songpal/default.nix Normal file
View File

@ -0,0 +1,68 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, fetchpatch
, poetry-core
, aiohttp
, async-upnp-client
, attrs
, click
, importlib-metadata
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "python-songpal";
version = "0.13";
format = "pyproject";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "rytilahti";
repo = "python-songpal";
rev = version;
sha256 = "124w6vfn992845k09bjv352havk8pg590b135m37h1x1m7fmbpwa";
};
patches = [
# https://github.com/rytilahti/python-songpal/pull/90
(fetchpatch {
name = "switch-to-poetry-core.patch";
url = "https://github.com/rytilahti/python-songpal/commit/56b634790d94b2f9788d5af3d5cedff47f1e42c2.patch";
sha256 = "0yc0mrb91ywk77nd4mxvyc0p2kjz2w1p395755a32ls30zw2bs27";
})
];
postPatch = ''
# https://github.com/rytilahti/python-songpal/issues/91
substituteInPlace pyproject.toml \
--replace 'click = "^7"' 'click = "*"'
'';
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
aiohttp
async-upnp-client
attrs
click
importlib-metadata
];
# no tests implemented
doCheck = false;
pythonImportsCheck = [ "songpal" ];
meta = with lib; {
description = "Python library for interfacing with Sony's Songpal devices";
homepage = "https://github.com/rytilahti/python-songpal";
license = licenses.gpl3Only;
maintainers = with maintainers; [ dotlambda ];
};
}

2
pkgs/os-specific/darwin/apple-sdk/default.nix
View File

@ -326,7 +326,7 @@ in rec {
"Versions/A/Frameworks/WebKitLegacy.framework/Versions/A/WebKitLegacy.tbd"
];
});
} // lib.genAttrs [ "ContactsPersistence" "GameCenter" "SkyLight" "UIFoundation" ] (x: tbdOnlyFramework x {});
} // lib.genAttrs [ "ContactsPersistence" "CoreSymbolication" "GameCenter" "SkyLight" "UIFoundation" ] (x: tbdOnlyFramework x {});
bareFrameworks = lib.mapAttrs framework (import ./frameworks.nix {
inherit frameworks libs;

2
pkgs/servers/home-assistant/component-packages.nix
View File

@ -787,7 +787,7 @@
"somfy" = ps: with ps; [ aiohttp-cors pymfy ];
"somfy_mylink" = ps: with ps; [ ]; # missing inputs: somfy-mylink-synergy
"sonarr" = ps: with ps; [ ]; # missing inputs: sonarr
"songpal" = ps: with ps; [ ]; # missing inputs: python-songpal
"songpal" = ps: with ps; [ python-songpal ];
"sonos" = ps: with ps; [ aiohttp-cors plexapi plexauth plexwebsocket pysonos ];
"sony_projector" = ps: with ps; [ ]; # missing inputs: pysdcp
"soundtouch" = ps: with ps; [ aiohttp-cors ifaddr libsoundtouch zeroconf ];

1
pkgs/servers/home-assistant/default.nix
View File

@ -665,6 +665,7 @@ in with py.pkgs; buildPythonApplication rec {
"solaredge"
"soma"
"somfy"
"songpal"
"sonos"
"soundtouch"
"spaceapi"

23
pkgs/tools/filesystems/exfatprogs/default.nix Normal file
View File

@ -0,0 +1,23 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, file }:
stdenv.mkDerivation rec {
pname = "exfatprogs";
version = "1.1.2";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "19pbybgbfnvjb3n944ihrn1r8ch4dm8dr0d44d6w7p63dcp372xy";
};
nativeBuildInputs = [ pkg-config autoreconfHook file ];
meta = with lib; {
description = "exFAT filesystem userspace utilities";
homepage = "https://github.com/exfatprogs/exfatprogs";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ zane ];
platforms = platforms.linux;
};
}

18
pkgs/tools/security/gpg-tui/default.nix
View File

@ -1,24 +1,30 @@
{ lib
, stdenv
, rustPlatform
, fetchFromGitHub
, gpgme
, libgpgerror
, libxcb
, python3
, AppKit
, Foundation
, libiconv
, libobjc
, libresolv
}:
rustPlatform.buildRustPackage rec {
pname = "gpg-tui";
version = "0.6.1";
version = "0.6.2";
src = fetchFromGitHub {
owner = "orhun";
repo = "gpg-tui";
rev = "v${version}";
sha256 = "sha256-ajzx54uQFNZraDwqEKG9sdlMquJnluiaCqsR+JT79jw=";
sha256 = "sha256-Iv5A+o4TNSHJeTZgZ2e0SCHclz1mGMVRJDdBAWilyT8=";
};
cargoSha256 = "sha256-UjrX+Z8slMBAiKhiFjxSoX74vIiFW9bMww49oPa18ag=";
cargoSha256 = "sha256-ISG/0WtgWwZoQd8PsvaQ9L8UKwerzEhY/84DxkdZV2g=";
nativeBuildInputs = [
gpgme # for gpgme-config
@ -30,6 +36,12 @@ rustPlatform.buildRustPackage rec {
gpgme
libgpgerror
libxcb
] ++ lib.optionals stdenv.isDarwin [
AppKit
Foundation
libiconv
libobjc
libresolv
];
meta = with lib; {

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

@ -2786,7 +2786,10 @@ in
Accelerate CoreGraphics CoreVideo;
};
gpg-tui = callPackage ../tools/security/gpg-tui { };
gpg-tui = callPackage ../tools/security/gpg-tui {
inherit (darwin.apple_sdk.frameworks) AppKit Foundation;
inherit (darwin) libobjc libresolv;
};
goa = callPackage ../development/tools/goa { };
@ -4954,6 +4957,8 @@ in
exfat = callPackage ../tools/filesystems/exfat { };
exfatprogs = callPackage ../tools/filesystems/exfatprogs { };
dos2unix = callPackage ../tools/text/dos2unix { };
uni2ascii = callPackage ../tools/text/uni2ascii { };
@ -30401,7 +30406,7 @@ in
root = callPackage ../applications/science/misc/root {
python = python3;
inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL;
inherit (darwin.apple_sdk.frameworks) Cocoa CoreSymbolication OpenGL;
};
root5 = lowPrio (callPackage ../applications/science/misc/root/5.nix {

1
pkgs/top-level/coq-packages.nix
View File

@ -75,6 +75,7 @@ let
QuickChick = callPackage ../development/coq-modules/QuickChick {};
reglang = callPackage ../development/coq-modules/reglang {};
relation-algebra = callPackage ../development/coq-modules/relation-algebra {};
semantics = callPackage ../development/coq-modules/semantics {};
simple-io = callPackage ../development/coq-modules/simple-io { };
stdpp = callPackage ../development/coq-modules/stdpp { };
StructTact = callPackage ../development/coq-modules/StructTact {};

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

@ -5365,6 +5365,8 @@ in {
python-openzwave-mqtt = callPackage ../development/python-modules/python-openzwave-mqtt { };
python-songpal = callPackage ../development/python-modules/python-songpal { };
python-tado = callPackage ../development/python-modules/python-tado { };
pkutils = callPackage ../development/python-modules/pkutils { };