ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2025-01-01 00:12:39 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #77047 from NixOS/staging-next

Browse Source 
Staging next
This commit is contained in:
Frederik Rietdijk 2020-01-14 15:44:15 +01:00 committed by GitHub
commit 05a965896d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
37 changed files with 118 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/languages-frameworks/python.section.md
View File

@ -496,8 +496,8 @@ and in this case the `python35` interpreter is automatically used.
### Interpreters ### Interpreters
Versions 2.7, 3.5, 3.6 and 3.7 of the CPython interpreter are available as Versions 2.7, 3.5, 3.6, 3.7 and 3.8 of the CPython interpreter are available as
respectively `python27`, `python35`, `python36` and `python37`. The aliases respectively `python27`, `python35`, `python36`, `python37` and `python38`. The aliases
`python2` and `python3` correspond to respectively `python27` and `python2` and `python3` correspond to respectively `python27` and
`python37`. The default interpreter, `python`, maps to `python2`. The PyPy `python37`. The default interpreter, `python`, maps to `python2`. The PyPy
interpreters compatible with Python 2.7 and 3 are available as `pypy27` and interpreters compatible with Python 2.7 and 3 are available as `pypy27` and

16
lib/systems/examples.nix
View File

@ -170,8 +170,8 @@ rec {
iphone64 = { iphone64 = {
config = "aarch64-apple-ios"; config = "aarch64-apple-ios";
# config = "aarch64-apple-darwin14"; # config = "aarch64-apple-darwin14";
sdkVer = "10.2"; sdkVer = "12.4";
xcodeVer = "8.2"; xcodeVer = "10.3";
xcodePlatform = "iPhoneOS"; xcodePlatform = "iPhoneOS";
useiOSPrebuilt = true; useiOSPrebuilt = true;
platform = {}; platform = {};
@ -180,8 +180,8 @@ rec {
iphone32 = { iphone32 = {
config = "armv7a-apple-ios"; config = "armv7a-apple-ios";
# config = "arm-apple-darwin10"; # config = "arm-apple-darwin10";
sdkVer = "10.2"; sdkVer = "12.4";
xcodeVer = "8.2"; xcodeVer = "10.3";
xcodePlatform = "iPhoneOS"; xcodePlatform = "iPhoneOS";
useiOSPrebuilt = true; useiOSPrebuilt = true;
platform = {}; platform = {};
@ -190,8 +190,8 @@ rec {
iphone64-simulator = { iphone64-simulator = {
config = "x86_64-apple-ios"; config = "x86_64-apple-ios";
# config = "x86_64-apple-darwin14"; # config = "x86_64-apple-darwin14";
sdkVer = "10.2"; sdkVer = "12.4";
xcodeVer = "8.2"; xcodeVer = "10.3";
xcodePlatform = "iPhoneSimulator"; xcodePlatform = "iPhoneSimulator";
useiOSPrebuilt = true; useiOSPrebuilt = true;
platform = {}; platform = {};
@ -200,8 +200,8 @@ rec {
iphone32-simulator = { iphone32-simulator = {
config = "i686-apple-ios"; config = "i686-apple-ios";
# config = "i386-apple-darwin11"; # config = "i386-apple-darwin11";
sdkVer = "10.2"; sdkVer = "12.4";
xcodeVer = "8.2"; xcodeVer = "10.3";
xcodePlatform = "iPhoneSimulator"; xcodePlatform = "iPhoneSimulator";
useiOSPrebuilt = true; useiOSPrebuilt = true;
platform = {}; platform = {};

4
pkgs/applications/audio/mda-lv2/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fftwSinglePrec, lv2, pkgconfig, python, wafHook }: { stdenv, fetchurl, fftwSinglePrec, lv2, pkgconfig, wafHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mda-lv2"; pname = "mda-lv2";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkgconfig wafHook ]; nativeBuildInputs = [ pkgconfig wafHook ];
buildInputs = [ fftwSinglePrec lv2 python ]; buildInputs = [ fftwSinglePrec lv2 ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://drobilla.net/software/mda-lv2/; homepage = http://drobilla.net/software/mda-lv2/;

4
pkgs/applications/office/gnumeric/default.nix
View File

@ -1,10 +1,10 @@
{ stdenv, fetchurl, pkgconfig, intltool, perlPackages { stdenv, fetchurl, pkgconfig, intltool, perlPackages
, goffice, gnome3, wrapGAppsHook, gtk3, bison, pythonPackages , goffice, gnome3, wrapGAppsHook, gtk3, bison, python3Packages
, itstool , itstool
}: }:
let let
inherit (pythonPackages) python pygobject3; inherit (python3Packages) python pygobject3;
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "gnumeric"; pname = "gnumeric";
version = "1.12.46"; version = "1.12.46";

9
pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
View File

@ -22,6 +22,15 @@ let
stripLen = "1"; stripLen = "1";
}) })
# Fix reproducibility by respecting generate.consistent.ids in indexes
# https://github.com/docbook/xslt10-stylesheets/pull/88
# https://sourceforge.net/p/docbook/bugs/1385/
(fetchpatch {
url = "https://github.com/docbook/xslt10-stylesheets/commit/07631601e6602bc49b8eac3aab9d2b35968d3e7a.patch";
sha256 = "0igfhcr6hzcydqsnjsd181h5yl3drjnrwdmxcybr236m8255vkq3";
stripLen = "1";
})
# Add legacy sourceforge.net URIs to the catalog # Add legacy sourceforge.net URIs to the catalog
(substituteAll { (substituteAll {
src = ./catalog-legacy-uris.patch; src = ./catalog-legacy-uris.patch;

2
pkgs/development/compilers/dtc/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchgit, flex, bison, pkgconfig, which { stdenv, lib, fetchgit, flex, bison, pkgconfig, which
, pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform, python, swig , pythonSupport ? false, python, swig
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {

2
pkgs/development/compilers/ghc/8.4.4.nix
View File

@ -7,7 +7,7 @@
, libiconv ? null, ncurses , libiconv ? null, ncurses
, useLLVM ? !stdenv.targetPlatform.isx86 || (stdenv.targetPlatform.isMusl && stdenv.hostPlatform != stdenv.targetPlatform) , useLLVM ? !stdenv.targetPlatform.isx86 || (stdenv.targetPlatform.isMusl && stdenv.hostPlatform != stdenv.targetPlatform) || stdenv.targetPlatform.isiOS
, # LLVM is conceptually a run-time-only depedendency, but for , # LLVM is conceptually a run-time-only depedendency, but for
# non-x86, we need LLVM to bootstrap later stages, so it becomes a # non-x86, we need LLVM to bootstrap later stages, so it becomes a
# build-time dependency too. # build-time dependency too.

2
pkgs/development/compilers/ghc/8.6.5.nix
View File

@ -10,7 +10,7 @@
, # GHC can be built with system libffi or a bundled one. , # GHC can be built with system libffi or a bundled one.
libffi ? null libffi ? null
, useLLVM ? !stdenv.targetPlatform.isx86 , useLLVM ? !stdenv.targetPlatform.isx86 || stdenv.targetPlatform.isiOS
, # LLVM is conceptually a run-time-only depedendency, but for , # LLVM is conceptually a run-time-only depedendency, but for
# non-x86, we need LLVM to bootstrap later stages, so it becomes a # non-x86, we need LLVM to bootstrap later stages, so it becomes a
# build-time dependency too. # build-time dependency too.

2
pkgs/development/compilers/ghc/8.8.1.nix
View File

@ -10,7 +10,7 @@
, # GHC can be built with system libffi or a bundled one. , # GHC can be built with system libffi or a bundled one.
libffi ? null libffi ? null
, useLLVM ? !stdenv.targetPlatform.isx86 , useLLVM ? !stdenv.targetPlatform.isx86 || stdenv.targetPlatform.isiOS
, # LLVM is conceptually a run-time-only depedendency, but for , # LLVM is conceptually a run-time-only depedendency, but for
# non-x86, we need LLVM to bootstrap later stages, so it becomes a # non-x86, we need LLVM to bootstrap later stages, so it becomes a
# build-time dependency too. # build-time dependency too.

2
pkgs/development/compilers/ghc/head.nix
View File

@ -10,7 +10,7 @@
, enableDwarf ? !stdenv.targetPlatform.isDarwin && , enableDwarf ? !stdenv.targetPlatform.isDarwin &&
!stdenv.targetPlatform.isWindows, elfutils # for DWARF support !stdenv.targetPlatform.isWindows, elfutils # for DWARF support
, useLLVM ? !stdenv.targetPlatform.isx86 , useLLVM ? !stdenv.targetPlatform.isx86 || stdenv.targetPlatform.isiOS
, # LLVM is conceptually a run-time-only depedendency, but for , # LLVM is conceptually a run-time-only depedendency, but for
# non-x86, we need LLVM to bootstrap later stages, so it becomes a # non-x86, we need LLVM to bootstrap later stages, so it becomes a
# build-time dependency too. # build-time dependency too.

4
pkgs/development/libraries/double-conversion/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, cmake, static ? false }: { stdenv, lib, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "double-conversion"; pname = "double-conversion";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];
# Case sensitivity issue # Case sensitivity issue
preConfigure = lib.optionalString stdenv.isDarwin '' preConfigure = lib.optionalString stdenv.isDarwin ''

4
pkgs/development/libraries/ffmpeg/generic.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, addOpenGLRunpath, perl, texinfo, yasm { stdenv, buildPackages, fetchurl, pkgconfig, addOpenGLRunpath, perl, texinfo, yasm
, alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg , alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg
, libssh, libtheora, libva, libdrm, libvorbis, libvpx, lzma, libpulseaudio, soxr , libssh, libtheora, libva, libdrm, libvorbis, libvpx, lzma, libpulseaudio, soxr
, x264, x265, xvidcore, zlib, libopus, speex, nv-codec-headers, dav1d , x264, x265, xvidcore, zlib, libopus, speex, nv-codec-headers, dav1d
@ -163,8 +163,10 @@ stdenv.mkDerivation rec {
] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
"--cross-prefix=${stdenv.cc.targetPrefix}" "--cross-prefix=${stdenv.cc.targetPrefix}"
"--enable-cross-compile" "--enable-cross-compile"
"--pkg-config=pkg-config" # Override ffmpeg's ./configure assumption that pkg-config is prefixed by the architecture. (e.g. aarch64-unknown-linux-gnu-pkg-config)
] ++ optional stdenv.cc.isClang "--cc=clang"); ] ++ optional stdenv.cc.isClang "--cc=clang");
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ addOpenGLRunpath perl pkgconfig texinfo yasm ]; nativeBuildInputs = [ addOpenGLRunpath perl pkgconfig texinfo yasm ];
buildInputs = [ buildInputs = [

10
pkgs/development/libraries/fmt/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, enableShared ? true }: { stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "6.0.0"; version = "6.0.0";
@ -17,16 +17,16 @@ stdenv.mkDerivation rec {
cmakeFlags = [ cmakeFlags = [
"-DFMT_TEST=TRUE" "-DFMT_TEST=TRUE"
"-DBUILD_SHARED_LIBS=${if enableShared then "TRUE" else "FALSE"}" "-DBUILD_SHARED_LIBS=TRUE"
]; ];
enableParallelBuilding = true; enableParallelBuilding = true;
doCheck = true; doCheck = true;
# preCheckHook ensures the test binaries can find libfmt.so # preCheckHook ensures the test binaries can find libfmt.so
preCheck = if enableShared preCheck = ''
then "export LD_LIBRARY_PATH=\"$PWD\"" export LD_LIBRARY_PATH="$PWD"
else ""; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Small, safe and fast formatting library"; description = "Small, safe and fast formatting library";

2
pkgs/development/libraries/folks/default.nix
View File

@ -21,7 +21,6 @@
, libsecret , libsecret
, db , db
, python3 , python3
, python
, readline , readline
, gtk3 , gtk3
}: }:
@ -51,7 +50,6 @@ stdenv.mkDerivation rec {
meson meson
ninja ninja
pkgconfig pkgconfig
python
python3 python3
vala vala
]; ];

6
pkgs/development/libraries/gstreamer/ges/default.nix
View File

@ -4,11 +4,10 @@
, meson , meson
, ninja , ninja
, pkgconfig , pkgconfig
, python , python3
, gst-plugins-base , gst-plugins-base
, libxml2 , libxml2
, flex , flex
, perl
, gettext , gettext
, gobject-introspection , gobject-introspection
}: }:
@ -34,9 +33,8 @@ stdenv.mkDerivation rec {
pkgconfig pkgconfig
gettext gettext
gobject-introspection gobject-introspection
python python3
flex flex
perl
]; ];
buildInputs = [ buildInputs = [

4
pkgs/development/libraries/gstreamer/ugly/default.nix
View File

@ -3,7 +3,7 @@
, meson , meson
, ninja , ninja
, pkgconfig , pkgconfig
, python , python3
, gst-plugins-base , gst-plugins-base
, orc , orc
, gettext , gettext
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
ninja ninja
gettext gettext
pkgconfig pkgconfig
python python3
]; ];
buildInputs = [ buildInputs = [

4
pkgs/development/libraries/gstreamer/validate/default.nix
View File

@ -3,7 +3,7 @@
, pkgconfig , pkgconfig
, gstreamer , gstreamer
, gst-plugins-base , gst-plugins-base
, python , python3
, gobject-introspection , gobject-introspection
, json-glib , json-glib
}: }:
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
python python3
json-glib json-glib
]; ];

5
pkgs/development/libraries/gtest/default.nix
View File

@ -1,5 +1,4 @@
{ stdenv, cmake, ninja, fetchFromGitHub { stdenv, cmake, ninja, fetchFromGitHub }:
, static ? false }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gtest"; pname = "gtest";
@ -20,7 +19,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ninja ]; nativeBuildInputs = [ cmake ninja ];
cmakeFlags = stdenv.lib.optional (!static) "-DBUILD_SHARED_LIBS=ON"; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Google's framework for writing C++ tests"; description = "Google's framework for writing C++ tests";

18
pkgs/development/libraries/libplist/default.nix
View File

@ -1,8 +1,5 @@
{ stdenv, autoreconfHook, fetchFromGitHub, pkgconfig, python2Packages, glib }: { stdenv, autoreconfHook, fetchFromGitHub, pkgconfig, enablePython ? false, python, glib }:
let
inherit (python2Packages) python cython;
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libplist"; pname = "libplist";
version = "2019-04-04"; version = "2019-04-04";
@ -14,18 +11,23 @@ stdenv.mkDerivation rec {
sha256 = "19yw80yblq29i2jx9yb7bx0lfychy9dncri3fk4as35kq5bf26i8"; sha256 = "19yw80yblq29i2jx9yb7bx0lfychy9dncri3fk4as35kq5bf26i8";
}; };
outputs = ["bin" "dev" "out" "py"]; outputs = ["bin" "dev" "out" ] ++ stdenv.lib.optional enablePython "py";
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
python
cython
autoreconfHook autoreconfHook
] ++ stdenv.lib.optionals enablePython [
python
python.pkgs.cython
];
configureFlags = stdenv.lib.optionals (!enablePython) [
"--without-cython"
]; ];
propagatedBuildInputs = [ glib ]; propagatedBuildInputs = [ glib ];
postFixup = '' postFixup = stdenv.lib.optionalString enablePython ''
moveToOutput "lib/${python.libPrefix}" "$py" moveToOutput "lib/${python.libPrefix}" "$py"
''; '';

4
pkgs/development/libraries/libpwquality/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, autoreconfHook, perl, cracklib, python }: { stdenv, lib, fetchFromGitHub, autoreconfHook, perl, cracklib, python3 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libpwquality"; pname = "libpwquality";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ autoreconfHook perl ]; nativeBuildInputs = [ autoreconfHook perl ];
buildInputs = [ cracklib python ]; buildInputs = [ cracklib python3 ];
meta = with lib; { meta = with lib; {
description = "Password quality checking and random password generation library"; description = "Password quality checking and random password generation library";

4
pkgs/development/libraries/qt-5/modules/qtdeclarative.nix
View File

@ -1,11 +1,11 @@
{ qtModule, lib, python2, qtbase, qtsvg }: { qtModule, lib, python3, qtbase, qtsvg }:
with lib; with lib;
qtModule { qtModule {
name = "qtdeclarative"; name = "qtdeclarative";
qtInputs = [ qtbase qtsvg ]; qtInputs = [ qtbase qtsvg ];
nativeBuildInputs = [ python2 ]; nativeBuildInputs = [ python3 ];
outputs = [ "out" "dev" "bin" ]; outputs = [ "out" "dev" "bin" ];
preConfigure = '' preConfigure = ''
NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QML2_IMPORT_PREFIX=\"$qtQmlPrefix\"" NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QML2_IMPORT_PREFIX=\"$qtQmlPrefix\""

2
pkgs/development/python-modules/hypothesis/default.nix
View File

@ -9,7 +9,7 @@ buildPythonPackage rec {
# pytz fake_factory django numpy pytest # pytz fake_factory django numpy pytest
# If you need these, you can just add them to your environment. # If you need these, you can just add them to your environment.
version = "4.56.1"; version = "4.41.0";
pname = "hypothesis"; pname = "hypothesis";
# Use github tarballs that includes tests # Use github tarballs that includes tests

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

@ -13,7 +13,7 @@
let let
pname = "setuptools"; pname = "setuptools";
version = "42.0.2"; version = "44.0.0";
# Create an sdist of setuptools # Create an sdist of setuptools
sdist = stdenv.mkDerivation rec { sdist = stdenv.mkDerivation rec {
@ -23,7 +23,7 @@ let
owner = "pypa"; owner = "pypa";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1xqx3sha5ir40g1h15r7q063bcbl9bvh967vig574k3jgwxrz2ik"; sha256 = "0z3q0qinyp1rmnxkw3y5f6nbsxhqlfq5k7skfrqa6ymb3zr009y1";
name = "${pname}-${version}-source"; name = "${pname}-${version}-source";
}; };

4
pkgs/development/tools/build-managers/gn/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchgit, darwin, writeText { stdenv, lib, fetchgit, darwin, writeText
, git, ninja, python2 }: , git, ninja, python3 }:
let let
rev = "64b846c96daeb3eaf08e26d8a84d8451c6cb712b"; rev = "64b846c96daeb3eaf08e26d8a84d8451c6cb712b";
@ -25,7 +25,7 @@ stdenv.mkDerivation {
inherit rev sha256; inherit rev sha256;
}; };
nativeBuildInputs = [ ninja python2 git ]; nativeBuildInputs = [ ninja python3 git ];
buildInputs = lib.optionals stdenv.isDarwin (with darwin; with apple_sdk.frameworks; [ buildInputs = lib.optionals stdenv.isDarwin (with darwin; with apple_sdk.frameworks; [
libobjc libobjc
cctools cctools

10
pkgs/os-specific/darwin/xcode/default.nix
View File

@ -45,7 +45,13 @@ in lib.makeExtensible (self: {
xcode_8_2 = requireXcode "8.2" "13nd1zsfqcp9hwp15hndr0rsbb8rgprrz7zr2ablj4697qca06m2"; xcode_8_2 = requireXcode "8.2" "13nd1zsfqcp9hwp15hndr0rsbb8rgprrz7zr2ablj4697qca06m2";
xcode_9_1 = requireXcode "9.1" "0ab1403wy84ys3yn26fj78cazhpnslmh3nzzp1wxib3mr1afjvic"; xcode_9_1 = requireXcode "9.1" "0ab1403wy84ys3yn26fj78cazhpnslmh3nzzp1wxib3mr1afjvic";
xcode_9_2 = requireXcode "9.2" "1bgfgdp266cbbqf2axcflz92frzvhi0qw0jdkcw6r85kdpc8dj4c"; xcode_9_2 = requireXcode "9.2" "1bgfgdp266cbbqf2axcflz92frzvhi0qw0jdkcw6r85kdpc8dj4c";
xcode_9_4 = requireXcode "9.4" "132l92c702lm8yrc62w4b8n2iap1qzqvklqzi39x9832ajysn6vw"; xcode_9_3 = requireXcode "9.3" "12m9kb4759s2ky42b1vf7y38qqxn2j99s99adzc6ljnmy26ii12w";
xcode_9_4 = requireXcode "9.4" "00az1cf9pm8zmvzs6yq04prdmxp8xi3ymxw94jjh4mh7hlbkhcb7";
xcode_9_4_1 = requireXcode "9.4.1" "0y9kphj86c14jl6aibv57sd7ln0w06vdhzm8ysp0s98rfgyq2lbw";
xcode_10_1 = requireXcode "10.1" "1ssdbg4v8r11fjf4jl38pwyry2aia1qihbxyxapz0v0n5gfnp05v"; xcode_10_1 = requireXcode "10.1" "1ssdbg4v8r11fjf4jl38pwyry2aia1qihbxyxapz0v0n5gfnp05v";
xcode = self."xcode_${lib.replaceStrings ["."] ["_"] (if stdenv.targetPlatform.useiOSPrebuilt then stdenv.targetPlatform.xcodeVer else "8.2")}"; xcode_10_2 = requireXcode "10.2" "1xzybl1gvb3q5qwlwchanzpws4sb70i3plf0vrzvlfdp2hsb3pg7";
xcode_10_2_1 = requireXcode "10.2.1" "11sdb54nr0x7kp987qq839x6k5gdx7vqdxjiy5xm5279n1n47bmg";
xcode_10_3 = requireXcode "10.3" "1i628vfn6zad81fsz3zpc6z15chhskvyp8qnajp2wnpzvrwl6ngb";
xcode_11 = requireXcode "11" "1r03j3kkp4blfp2kqpn538w3dx57ms930fj8apjkq6dk7fv3jcqh";
xcode = self."xcode_${lib.replaceStrings ["."] ["_"] (if stdenv.targetPlatform.useiOSPrebuilt then stdenv.targetPlatform.xcodeVer else "10.3")}";
}) })

3
pkgs/os-specific/darwin/xcode/sdk-pkgs.nix
View File

@ -7,6 +7,7 @@
, wrapCCWith , wrapCCWith
, buildIosSdk, targetIosSdkPkgs , buildIosSdk, targetIosSdkPkgs
, xcode , xcode
, lib
}: }:
let let
@ -48,7 +49,7 @@ rec {
tr '\n' ' ' < $out/nix-support/cc-cflags > cc-cflags.tmp tr '\n' ' ' < $out/nix-support/cc-cflags > cc-cflags.tmp
mv cc-cflags.tmp $out/nix-support/cc-cflags mv cc-cflags.tmp $out/nix-support/cc-cflags
echo "-target ${targetPlatform.config} -arch ${iosPlatformArch targetPlatform}" >> $out/nix-support/cc-cflags echo "-target ${targetPlatform.config} -arch ${iosPlatformArch targetPlatform}" >> $out/nix-support/cc-cflags
echo "-isystem ${sdk}/usr/include -isystem ${sdk}/usr/include/c++/4.2.1/ -stdlib=libstdc++" >> $out/nix-support/cc-cflags echo "-isystem ${sdk}/usr/include${lib.optionalString (lib.versionAtLeast "10" sdk.version) " -isystem ${sdk}/usr/include/c++/4.2.1/ -stdlib=libstdc++"}" >> $out/nix-support/cc-cflags
'' + stdenv.lib.optionalString (sdk.platform == "iPhoneSimulator") '' '' + stdenv.lib.optionalString (sdk.platform == "iPhoneSimulator") ''
echo "-mios-simulator-version-min=${minSdkVersion}" >> $out/nix-support/cc-cflags echo "-mios-simulator-version-min=${minSdkVersion}" >> $out/nix-support/cc-cflags
'' + stdenv.lib.optionalString (sdk.platform == "iPhoneOS") '' '' + stdenv.lib.optionalString (sdk.platform == "iPhoneOS") ''

5
pkgs/os-specific/linux/apparmor/default.nix
View File

@ -51,6 +51,11 @@ let
# (alpine patches {1,4,5,6,8} are needed for apparmor 2.11, but not 2.12) # (alpine patches {1,4,5,6,8} are needed for apparmor 2.11, but not 2.12)
] ++ [ ] ++ [
./cross.patch ./cross.patch
# Support Python 3.8
(fetchpatch {
url = https://gitlab.com/apparmor/apparmor/commit/ccbf1e0bf1bf5c3bbab47029fbbc5415ef73bac1.patch;
sha256 = "0kfzc0wyjybj38n10yvwakaaqvglalzigd3kk7gcrbp1xdn70pq2";
})
]; ];
# Set to `true` after the next FIXME gets fixed or this gets some # Set to `true` after the next FIXME gets fixed or this gets some

24
pkgs/os-specific/linux/crda/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, libgcrypt, libnl, pkgconfig, python2Packages, wireless-regdb }: { stdenv, fetchurl, fetchpatch, libgcrypt, libnl, pkgconfig, python3, wireless-regdb }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "crda"; pname = "crda";
@ -9,9 +9,24 @@ stdenv.mkDerivation rec {
url = "http://kernel.org/pub/software/network/crda/crda-${version}.tar.xz"; url = "http://kernel.org/pub/software/network/crda/crda-${version}.tar.xz";
}; };
patches = [
# Switch to Python 3
# https://lore.kernel.org/linux-wireless/1437542484-23409-1-git-send-email-ahmed.taahir@gmail.com/
(fetchpatch {
url = "https://lore.kernel.org/linux-wireless/1437542484-23409-2-git-send-email-ahmed.taahir@gmail.com/raw";
sha256 = "0s2n340cgaasvg1k8g9v8xjrbh4y2mcgrhdmv97ja2fs8xjcjbf1";
})
(fetchpatch {
url = "https://lore.kernel.org/linux-wireless/1437542484-23409-3-git-send-email-ahmed.taahir@gmail.com/raw";
sha256 = "01dlfw7kqhyx025jxq2l75950b181p9r7i9zkflcwvbzzdmx59md";
})
];
buildInputs = [ libgcrypt libnl ]; buildInputs = [ libgcrypt libnl ];
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig python2Packages.m2crypto python2Packages.python pkgconfig
python3
python3.pkgs.pycrypto
]; ];
postPatch = '' postPatch = ''
@ -37,6 +52,11 @@ stdenv.mkDerivation rec {
doCheck = true; doCheck = true;
checkTarget = "verify"; checkTarget = "verify";
postInstall = ''
# The patch installs build header
rm $out/include/reglib/keys-gcrypt.h
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Linux wireless Central Regulatory Domain Agent"; description = "Linux wireless Central Regulatory Domain Agent";
longDescription = '' longDescription = ''

2
pkgs/os-specific/linux/libnl/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, file, lib, fetchFromGitHub, autoreconfHook, bison, flex, pkgconfig { stdenv, file, lib, fetchFromGitHub, autoreconfHook, bison, flex, pkgconfig
, pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform, swig ? null, python}: , pythonSupport ? false, swig ? null, python}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libnl"; pname = "libnl";

1
pkgs/stdenv/adapters.nix
View File

@ -60,6 +60,7 @@ rec {
"--enable-static" "--enable-static"
"--disable-shared" "--disable-shared"
]; ];
cmakeFlags = (args.cmakeFlags or []) ++ [ "-DBUILD_SHARED_LIBS:BOOL=OFF" ];
mesonFlags = (args.mesonFlags or []) ++ [ "-Ddefault_library=static" ]; mesonFlags = (args.mesonFlags or []) ++ [ "-Ddefault_library=static" ];
}); });
}; };

4
pkgs/tools/networking/strongswan/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchpatch { stdenv, fetchurl, fetchpatch
, pkgconfig, autoreconfHook , pkgconfig, autoreconfHook
, gmp, python, iptables, ldns, unbound, openssl, pcsclite, glib , gmp, python3, iptables, ldns, unbound, openssl, pcsclite, glib
, openresolv , openresolv
, systemd, pam , systemd, pam
, curl , curl
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig autoreconfHook ]; nativeBuildInputs = [ pkgconfig autoreconfHook ];
buildInputs = buildInputs =
[ curl gmp python ldns unbound openssl pcsclite ] [ curl gmp python3 ldns unbound openssl pcsclite ]
++ optionals enableTNC [ trousers sqlite libxml2 ] ++ optionals enableTNC [ trousers sqlite libxml2 ]
++ optionals stdenv.isLinux [ systemd.dev pam iptables ] ++ optionals stdenv.isLinux [ systemd.dev pam iptables ]
++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ SystemConfiguration ]) ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ SystemConfiguration ])

4
pkgs/tools/package-management/packagekit/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, lib { stdenv, fetchFromGitHub, lib
, intltool, glib, pkgconfig, polkit, python, sqlite , intltool, glib, pkgconfig, polkit, python3, sqlite
, gobject-introspection, vala, gtk-doc, autoreconfHook, autoconf-archive , gobject-introspection, vala, gtk-doc, autoreconfHook, autoconf-archive
# TODO: set enableNixBackend to true, as soon as it builds # TODO: set enableNixBackend to true, as soon as it builds
, nix, enableNixBackend ? false, boost , nix, enableNixBackend ? false, boost
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
sha256 = "02wq3jw3mkdld90irh5vdfd5bri2g1p89mhrmj56kvif1fqak46x"; sha256 = "02wq3jw3mkdld90irh5vdfd5bri2g1p89mhrmj56kvif1fqak46x";
}; };
buildInputs = [ glib polkit python gobject-introspection ] buildInputs = [ glib polkit python3 gobject-introspection ]
++ lib.optional enableSystemd systemd ++ lib.optional enableSystemd systemd
++ lib.optional enableBashCompletion bash-completion; ++ lib.optional enableBashCompletion bash-completion;
propagatedBuildInputs = [ sqlite nix boost ]; propagatedBuildInputs = [ sqlite nix boost ];

4
pkgs/tools/system/htop/default.nix
View File

@ -1,5 +1,5 @@
{ lib, fetchurl, stdenv, ncurses, { lib, fetchurl, stdenv, ncurses,
IOKit, python }: IOKit, python3 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "htop"; pname = "htop";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "0mrwpb3cpn3ai7ar33m31yklj64c3pp576vh1naqff6f21pq5mnr"; sha256 = "0mrwpb3cpn3ai7ar33m31yklj64c3pp576vh1naqff6f21pq5mnr";
}; };
nativeBuildInputs = [ python ]; nativeBuildInputs = [ python3 ];
buildInputs = buildInputs =
[ ncurses ] ++ [ ncurses ] ++
lib.optionals stdenv.isDarwin [ IOKit ]; lib.optionals stdenv.isDarwin [ IOKit ];

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

@ -10821,7 +10821,7 @@ in
arrayfire = callPackage ../development/libraries/arrayfire {}; arrayfire = callPackage ../development/libraries/arrayfire {};
arrow-cpp = callPackage ../development/libraries/arrow-cpp ({ arrow-cpp = callPackage ../development/libraries/arrow-cpp ({
gtest = gtest.override { static = true; }; inherit (pkgsStatic) gtest;
} // stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { } // stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) {
stdenv = overrideCC stdenv buildPackages.gcc6; # hidden symbol `__divmoddi4' stdenv = overrideCC stdenv buildPackages.gcc6; # hidden symbol `__divmoddi4'
}); });

8
pkgs/top-level/darwin-packages.nix
View File

@ -68,8 +68,12 @@ in
usr-include = callPackage ../os-specific/darwin/usr-include { }; usr-include = callPackage ../os-specific/darwin/usr-include { };
inherit (callPackages ../os-specific/darwin/xcode { } ) inherit (callPackages ../os-specific/darwin/xcode { })
xcode_8_1 xcode_8_2 xcode_9_1 xcode_9_2 xcode_9_4 xcode; xcode_8_1 xcode_8_2
xcode_9_1 xcode_9_2 xcode_9_4 xcode_9_4_1
xcode_10_2 xcode_10_2_1 xcode_10_3
xcode_11
xcode;
CoreSymbolication = callPackage ../os-specific/darwin/CoreSymbolication { }; CoreSymbolication = callPackage ../os-specific/darwin/CoreSymbolication { };

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

@ -3970,7 +3970,7 @@ in {
libsavitar = callPackage ../development/python-modules/libsavitar { }; libsavitar = callPackage ../development/python-modules/libsavitar { };
libplist = disabledIf isPy3k libplist = disabledIf isPy3k
(toPythonModule (pkgs.libplist.override{python2Packages=self; })).py; (toPythonModule (pkgs.libplist.override { enablePython = true; inherit python; })).py;
libxml2 = (toPythonModule (pkgs.libxml2.override{pythonSupport=true; inherit python;})).py; libxml2 = (toPythonModule (pkgs.libxml2.override{pythonSupport=true; inherit python;})).py;

9
pkgs/top-level/static.nix
View File

@ -185,21 +185,12 @@ in {
static = true; static = true;
twisted = null; twisted = null;
}; };
double-conversion = super.double-conversion.override {
static = true;
};
gmp = super.gmp.override { gmp = super.gmp.override {
withStatic = true; withStatic = true;
}; };
gflags = super.gflags.override { gflags = super.gflags.override {
enableShared = false; enableShared = false;
}; };
glog = super.glog.override {
static = true;
};
gtest = super.gtest.override {
static = true;
};
cdo = super.cdo.override { cdo = super.cdo.override {
enable_all_static = true; enable_all_static = true;
}; };