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

Merge staging-next-21.05 into staging-21.05

Browse Source
This commit is contained in:
github-actions[bot] 2021-07-02 00:05:13 +00:00 committed by GitHub
commit c75ea2baa8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@
, libX11, libXpm, libXft, libXext, libGLU, libGL, libxml2, lz4, xz, pcre , libX11, libXpm, libXft, libXext, libGLU, libGL, libxml2, lz4, xz, pcre
, pkg-config, python, xxHash, zlib, zstd , pkg-config, python, xxHash, zlib, zstd
, libAfterImage, giflib, libjpeg, libtiff, libpng , libAfterImage, giflib, libjpeg, libtiff, libpng
, Cocoa, OpenGL, noSplash ? false }: , Cocoa, CoreSymbolication, OpenGL, noSplash ? false }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "root"; pname = "root";
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper cmake pkg-config llvm_5.dev ]; nativeBuildInputs = [ makeWrapper cmake pkg-config llvm_5.dev ];
buildInputs = [ ftgl gl2ps glew pcre zlib zstd llvm_5 libxml2 lz4 xz gsl xxHash libAfterImage giflib libjpeg libtiff libpng python.pkgs.numpy ] buildInputs = [ ftgl gl2ps glew pcre zlib zstd llvm_5 libxml2 lz4 xz gsl xxHash libAfterImage giflib libjpeg libtiff libpng python.pkgs.numpy ]
++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] ++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ]
++ lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] ++ lib.optionals (stdenv.isDarwin) [ Cocoa CoreSymbolication OpenGL ]
; ;
patches = [ patches = [
@ -31,6 +31,10 @@ stdenv.mkDerivation rec {
patchShebangs build/unix/ patchShebangs build/unix/
'' + lib.optionalString noSplash '' '' + lib.optionalString noSplash ''
substituteInPlace rootx/src/rootx.cxx --replace "gNoLogo = false" "gNoLogo = true" 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 = [ cmakeFlags = [

11
pkgs/development/python-modules/datasette/default.nix
View File

@ -1,6 +1,7 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, aiofiles , aiofiles
, asgi-csrf , asgi-csrf
, click , click
@ -36,6 +37,14 @@ buildPythonPackage rec {
sha256 = "sha256-Ixh56X9dI/FIJPXHXXGnFiYj3qeBmvW5L1FF7/0ofUQ="; sha256 = "sha256-Ixh56X9dI/FIJPXHXXGnFiYj3qeBmvW5L1FF7/0ofUQ=";
}; };
patches = [
(fetchpatch {
name = "CVE-2021-32670.patch";
url = "https://github.com/simonw/datasette/commit/26fc539312bca2551b6f048b6bcf4ffbb491289f.patch";
sha256 = "1d4yy6dqb4l7y0c5xpdvl66522ckdb34wnqvzqw73pdl2hr5jsml";
})
];
nativeBuildInputs = [ pytestrunner ]; nativeBuildInputs = [ pytestrunner ];
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -80,6 +89,8 @@ buildPythonPackage rec {
# just run the csv tests, as this should give some indictation of correctness # just run the csv tests, as this should give some indictation of correctness
pytestFlagsArray = [ pytestFlagsArray = [
"tests/test_csv.py" "tests/test_csv.py"
# covers patched CVE-2021-32670
"tests/test_html.py"
]; ];
disabledTests = [ disabledTests = [
"facet" "facet"

4
pkgs/development/python-modules/fastapi/default.nix
View File

@ -17,14 +17,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "fastapi"; pname = "fastapi";
version = "0.65.0"; version = "0.65.2";
format = "flit"; format = "flit";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tiangolo"; owner = "tiangolo";
repo = "fastapi"; repo = "fastapi";
rev = version; rev = version;
sha256 = "sha256-DPfijCGORF3ThZblqaYTKN0H8+wlhtdIS8lfKfJl/bY="; sha256 = "032srvbfdy02m1b664x67lkdcx6b2bd4c9a9cb176lscjk213240";
}; };
postPatch = '' postPatch = ''

4
pkgs/development/python-modules/pydantic/default.nix
View File

@ -12,14 +12,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pydantic"; pname = "pydantic";
version = "1.8.1"; version = "1.8.2";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "samuelcolvin"; owner = "samuelcolvin";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1zvcmx3927fgx37gdhi8g8igvrkri1v78rn3118p4wssqhgfwa6n"; sha256 = "06162dss6mvi7wiy2lzxwvzajwxgy8b2fyym7qipaj7zibcqalq2";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

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" "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 { bareFrameworks = lib.mapAttrs framework (import ./frameworks.nix {
inherit frameworks libs; inherit frameworks libs;

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

@ -29947,7 +29947,7 @@ in
root = callPackage ../applications/science/misc/root { root = callPackage ../applications/science/misc/root {
python = python3; 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 { root5 = lowPrio (callPackage ../applications/science/misc/root/5.nix {