From 730c92d9e223537a0279a3db6d03283757444680 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 25 Dec 2019 07:13:59 +0100 Subject: [PATCH 01/37] libplist: disable python by default Introduced in 6449435b04cb608389e3d1df653fed857633b724, only Python 2 is supported and it does not seem to be used by anything. --- .../development/libraries/libplist/default.nix | 18 ++++++++++-------- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/libplist/default.nix b/pkgs/development/libraries/libplist/default.nix index 19b700ca5e3..63599c4352d 100644 --- a/pkgs/development/libraries/libplist/default.nix +++ b/pkgs/development/libraries/libplist/default.nix @@ -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 { pname = "libplist"; version = "2019-04-04"; @@ -14,18 +11,23 @@ stdenv.mkDerivation rec { sha256 = "19yw80yblq29i2jx9yb7bx0lfychy9dncri3fk4as35kq5bf26i8"; }; - outputs = ["bin" "dev" "out" "py"]; + outputs = ["bin" "dev" "out" ] ++ stdenv.lib.optional enablePython "py"; nativeBuildInputs = [ pkgconfig - python - cython autoreconfHook + ] ++ stdenv.lib.optionals enablePython [ + python + python.pkgs.cython + ]; + + configureFlags = stdenv.lib.optionals (!enablePython) [ + "--without-cython" ]; propagatedBuildInputs = [ glib ]; - postFixup = '' + postFixup = stdenv.lib.optionalString enablePython '' moveToOutput "lib/${python.libPrefix}" "$py" ''; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ec8df201741..b25186a0aa6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3863,7 +3863,7 @@ in { libsavitar = callPackage ../development/python-modules/libsavitar { }; 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; From 4cb22aa377fc688bf58f9d433652820f95e7e90d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 25 Dec 2019 07:28:58 +0100 Subject: [PATCH 02/37] gst_all_1.gst-validate: switch to python 3 --- pkgs/development/libraries/gstreamer/validate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/validate/default.nix b/pkgs/development/libraries/gstreamer/validate/default.nix index 9439ddd94e8..74e89848163 100644 --- a/pkgs/development/libraries/gstreamer/validate/default.nix +++ b/pkgs/development/libraries/gstreamer/validate/default.nix @@ -3,7 +3,7 @@ , pkgconfig , gstreamer , gst-plugins-base -, python +, python3 , gobject-introspection , json-glib }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - python + python3 json-glib ]; From 544ae9608258c149a1751ac04b4ad7fbb84b49a3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 25 Dec 2019 07:36:29 +0100 Subject: [PATCH 03/37] gst_all_1.gst-editing-services: switch to python 3 Also remove no longer needed perl. --- pkgs/development/libraries/gstreamer/ges/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index 6e9a604f794..af2579d0594 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -4,11 +4,10 @@ , meson , ninja , pkgconfig -, python +, python3 , gst-plugins-base , libxml2 , flex -, perl , gettext , gobject-introspection }: @@ -34,9 +33,8 @@ stdenv.mkDerivation rec { pkgconfig gettext gobject-introspection - python + python3 flex - perl ]; buildInputs = [ From c691baf85fbcf0dd47174e82e59b03bbf58a1df8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 25 Dec 2019 07:46:32 +0100 Subject: [PATCH 04/37] strongswan: switch to python 3 --- pkgs/tools/networking/strongswan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index 27453083d59..fb7de5486fb 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch , pkgconfig, autoreconfHook -, gmp, python, iptables, ldns, unbound, openssl, pcsclite, glib +, gmp, python3, iptables, ldns, unbound, openssl, pcsclite, glib , openresolv , systemd, pam , curl @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = - [ curl gmp python ldns unbound openssl pcsclite ] + [ curl gmp python3 ldns unbound openssl pcsclite ] ++ optionals enableTNC [ trousers sqlite libxml2 ] ++ optionals stdenv.isLinux [ systemd.dev pam iptables ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ SystemConfiguration ]) From 8b6d76525ea92156504aa76764d9a0962bb2eb58 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 25 Dec 2019 08:03:15 +0100 Subject: [PATCH 05/37] libnl: disable python support by default Nothing much seems to be using it and we do not want Python 2 in our closure. --- pkgs/os-specific/linux/libnl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/libnl/default.nix b/pkgs/os-specific/linux/libnl/default.nix index b3ccda3b50d..61380115ab5 100644 --- a/pkgs/os-specific/linux/libnl/default.nix +++ b/pkgs/os-specific/linux/libnl/default.nix @@ -1,5 +1,5 @@ { stdenv, file, lib, fetchFromGitHub, autoreconfHook, bison, flex, pkgconfig -, pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform, swig ? null, python}: +, pythonSupport ? false, swig ? null, python}: stdenv.mkDerivation rec { pname = "libnl"; From 23ec74b1b25d7743f02c0ceabac442a4fdad0e62 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 25 Dec 2019 08:29:14 +0100 Subject: [PATCH 06/37] dtc: disable Python support by default It does not seem to be used by anything and we want to get rid of Python 2 from closure. --- pkgs/development/compilers/dtc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/dtc/default.nix b/pkgs/development/compilers/dtc/default.nix index eea75c5ace1..78e5eccbf14 100644 --- a/pkgs/development/compilers/dtc/default.nix +++ b/pkgs/development/compilers/dtc/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchgit, flex, bison, pkgconfig, which -, pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform, python, swig +, pythonSupport ? false, python, swig }: stdenv.mkDerivation rec { From e9cdcde6ea3cac061c70f808a2a87ca4388cb52b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 25 Dec 2019 08:44:13 +0100 Subject: [PATCH 07/37] gst_all_1.gst-plugins-ugly: switch to python 3 --- pkgs/development/libraries/gstreamer/ugly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index 870b4468860..d8c36fa4070 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -3,7 +3,7 @@ , meson , ninja , pkgconfig -, python +, python3 , gst-plugins-base , orc , gettext @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ninja gettext pkgconfig - python + python3 ]; buildInputs = [ From c72e388b7f5c0968c28e0b35922b89fc34fb6242 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 25 Dec 2019 08:54:23 +0100 Subject: [PATCH 08/37] gn: switch to python 3 --- pkgs/development/tools/build-managers/gn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/gn/default.nix b/pkgs/development/tools/build-managers/gn/default.nix index 7b29e7d02dc..d8557bfcbc2 100644 --- a/pkgs/development/tools/build-managers/gn/default.nix +++ b/pkgs/development/tools/build-managers/gn/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchgit, darwin, writeText -, git, ninja, python2 }: +, git, ninja, python3 }: let rev = "64b846c96daeb3eaf08e26d8a84d8451c6cb712b"; @@ -25,7 +25,7 @@ stdenv.mkDerivation { inherit rev sha256; }; - nativeBuildInputs = [ ninja python2 git ]; + nativeBuildInputs = [ ninja python3 git ]; buildInputs = lib.optionals stdenv.isDarwin (with darwin; with apple_sdk.frameworks; [ libobjc cctools From e4bd8a6faba6cbd1e4ebb0617a1727cfea1ada19 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 25 Dec 2019 09:02:20 +0100 Subject: [PATCH 09/37] htop: switch to python 3 --- pkgs/tools/system/htop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix index 12e54b1b22e..1b68273a570 100644 --- a/pkgs/tools/system/htop/default.nix +++ b/pkgs/tools/system/htop/default.nix @@ -1,5 +1,5 @@ { lib, fetchurl, stdenv, ncurses, -IOKit, python }: +IOKit, python3 }: stdenv.mkDerivation rec { pname = "htop"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0mrwpb3cpn3ai7ar33m31yklj64c3pp576vh1naqff6f21pq5mnr"; }; - nativeBuildInputs = [ python ]; + nativeBuildInputs = [ python3 ]; buildInputs = [ ncurses ] ++ lib.optionals stdenv.isDarwin [ IOKit ]; From b842dfd6e4dfac0234be486cac457d94d5e31434 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 25 Dec 2019 09:14:51 +0100 Subject: [PATCH 10/37] folks: only depend on Python 3 For some reason we depended on both. --- pkgs/development/libraries/folks/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/libraries/folks/default.nix b/pkgs/development/libraries/folks/default.nix index 38e4d2c6884..c08be846915 100644 --- a/pkgs/development/libraries/folks/default.nix +++ b/pkgs/development/libraries/folks/default.nix @@ -21,7 +21,6 @@ , libsecret , db , python3 -, python , readline , gtk3 }: @@ -51,7 +50,6 @@ stdenv.mkDerivation rec { meson ninja pkgconfig - python python3 vala ]; From 1fd1737dbdf32b04df3937c2e49bb0ddcda42fe3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 25 Dec 2019 09:17:04 +0100 Subject: [PATCH 11/37] mda_lv2: drop python dep MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It does not appear to be actually necessary – wafHook will add it. --- pkgs/applications/audio/mda-lv2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/mda-lv2/default.nix b/pkgs/applications/audio/mda-lv2/default.nix index 61f2bc33f7f..6c4170cf0fb 100644 --- a/pkgs/applications/audio/mda-lv2/default.nix +++ b/pkgs/applications/audio/mda-lv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fftwSinglePrec, lv2, pkgconfig, python, wafHook }: +{ stdenv, fetchurl, fftwSinglePrec, lv2, pkgconfig, wafHook }: stdenv.mkDerivation rec { pname = "mda-lv2"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig wafHook ]; - buildInputs = [ fftwSinglePrec lv2 python ]; + buildInputs = [ fftwSinglePrec lv2 ]; meta = with stdenv.lib; { homepage = http://drobilla.net/software/mda-lv2/; From 843d147596d7998e4d74f96c42b9e6f41f926c2d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 25 Dec 2019 09:29:32 +0100 Subject: [PATCH 12/37] gnumeric: switch to python 3 --- pkgs/applications/office/gnumeric/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index 979c960f7a8..710a66c25d8 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, intltool, perlPackages -, goffice, gnome3, wrapGAppsHook, gtk3, bison, pythonPackages +, goffice, gnome3, wrapGAppsHook, gtk3, bison, python3Packages , itstool }: let - inherit (pythonPackages) python pygobject3; + inherit (python3Packages) python pygobject3; in stdenv.mkDerivation rec { pname = "gnumeric"; version = "1.12.46"; From c16bcf71ec5c11228eb8bb4e40619a1c48cb4ff1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 25 Dec 2019 09:29:57 +0100 Subject: [PATCH 13/37] packagekit: switch to python 3 --- pkgs/tools/package-management/packagekit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix index a3c3c0d40a9..81cfcb662c4 100644 --- a/pkgs/tools/package-management/packagekit/default.nix +++ b/pkgs/tools/package-management/packagekit/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, lib -, intltool, glib, pkgconfig, polkit, python, sqlite +, intltool, glib, pkgconfig, polkit, python3, sqlite , gobject-introspection, vala, gtk-doc, autoreconfHook, autoconf-archive # TODO: set enableNixBackend to true, as soon as it builds , nix, enableNixBackend ? false, boost @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { sha256 = "02wq3jw3mkdld90irh5vdfd5bri2g1p89mhrmj56kvif1fqak46x"; }; - buildInputs = [ glib polkit python gobject-introspection ] + buildInputs = [ glib polkit python3 gobject-introspection ] ++ lib.optional enableSystemd systemd ++ lib.optional enableBashCompletion bash-completion; propagatedBuildInputs = [ sqlite nix boost ]; From 7e8293edcb854fa647224b6387177836286302ff Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 25 Dec 2019 09:30:13 +0100 Subject: [PATCH 14/37] qt5.qtdeclarative: switch to python 3 --- pkgs/development/libraries/qt-5/modules/qtdeclarative.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix b/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix index 7c1fa449ebb..b611282294c 100644 --- a/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix +++ b/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix @@ -1,11 +1,11 @@ -{ qtModule, lib, python2, qtbase, qtsvg }: +{ qtModule, lib, python3, qtbase, qtsvg }: with lib; qtModule { name = "qtdeclarative"; qtInputs = [ qtbase qtsvg ]; - nativeBuildInputs = [ python2 ]; + nativeBuildInputs = [ python3 ]; outputs = [ "out" "dev" "bin" ]; preConfigure = '' NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QML2_IMPORT_PREFIX=\"$qtQmlPrefix\"" From 6577ec986a6e13a8d9cad4e38501ab618f11c14a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 25 Dec 2019 09:32:21 +0100 Subject: [PATCH 15/37] libpwquality: switch to python 3 Nothing seems to use the Python bindings anyway. --- pkgs/development/libraries/libpwquality/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libpwquality/default.nix b/pkgs/development/libraries/libpwquality/default.nix index b0d5513ca0f..c3ad33173cd 100644 --- a/pkgs/development/libraries/libpwquality/default.nix +++ b/pkgs/development/libraries/libpwquality/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, perl, cracklib, python }: +{ stdenv, lib, fetchFromGitHub, autoreconfHook, perl, cracklib, python3 }: stdenv.mkDerivation rec { pname = "libpwquality"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook perl ]; - buildInputs = [ cracklib python ]; + buildInputs = [ cracklib python3 ]; meta = with lib; { description = "Password quality checking and random password generation library"; From 4a583c8be5cd0ab31bc09c5d295e0676179bcdc1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 25 Dec 2019 16:08:06 +0100 Subject: [PATCH 16/37] crda: port to Python 3 --- pkgs/os-specific/linux/crda/default.nix | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/crda/default.nix b/pkgs/os-specific/linux/crda/default.nix index 84c113c648c..501b1fb1884 100644 --- a/pkgs/os-specific/linux/crda/default.nix +++ b/pkgs/os-specific/linux/crda/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libgcrypt, libnl, pkgconfig, python2Packages, wireless-regdb }: +{ stdenv, fetchurl, fetchpatch, libgcrypt, libnl, pkgconfig, python3, wireless-regdb }: stdenv.mkDerivation rec { pname = "crda"; @@ -9,9 +9,24 @@ stdenv.mkDerivation rec { 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 ]; nativeBuildInputs = [ - pkgconfig python2Packages.m2crypto python2Packages.python + pkgconfig + python3 + python3.pkgs.pycrypto ]; postPatch = '' @@ -37,6 +52,11 @@ stdenv.mkDerivation rec { doCheck = true; checkTarget = "verify"; + postInstall = '' + # The patch installs build header + rm $out/include/reglib/keys-gcrypt.h + ''; + meta = with stdenv.lib; { description = "Linux wireless Central Regulatory Domain Agent"; longDescription = '' From d05ee9c8ffec48e10bc71dab601e70a44fbc8675 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 29 Dec 2019 15:40:52 -0500 Subject: [PATCH 17/37] pkgsStatic: set BUILD_SHARED_LIBS=OFF for cmake --- pkgs/stdenv/adapters.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 041964bcacc..8b23d3dadd2 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -60,6 +60,7 @@ rec { "--enable-static" "--disable-shared" ]; + cmakeFlags = (args.cmakeFlags or []) ++ [ "-DBUILD_SHARED_LIBS:BOOL=OFF" ]; mesonFlags = (args.mesonFlags or []) ++ [ "-Ddefault_library=static" ]; }); }; From 7e5b4958519ad796a1a74b507e16f989b4eaa305 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 31 Dec 2019 18:25:53 -0500 Subject: [PATCH 18/37] fmt: remove the enableShared option Static libraries are to be provided by the pkgsStatic.fmt package. --- pkgs/development/libraries/fmt/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix index fd35b697d7c..3e79ebe15cf 100644 --- a/pkgs/development/libraries/fmt/default.nix +++ b/pkgs/development/libraries/fmt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, enableShared ? true }: +{ stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { version = "6.0.0"; @@ -17,16 +17,16 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DFMT_TEST=TRUE" - "-DBUILD_SHARED_LIBS=${if enableShared then "TRUE" else "FALSE"}" + "-DBUILD_SHARED_LIBS=TRUE" ]; enableParallelBuilding = true; doCheck = true; # preCheckHook ensures the test binaries can find libfmt.so - preCheck = if enableShared - then "export LD_LIBRARY_PATH=\"$PWD\"" - else ""; + preCheck = '' + export LD_LIBRARY_PATH="$PWD" + ''; meta = with stdenv.lib; { description = "Small, safe and fast formatting library"; From 7e2c821e58b974427cf9e3538d7ed3ed4a3a0db5 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 1 Jan 2020 16:56:55 -0500 Subject: [PATCH 19/37] gtest: remove the "static" option pkgsStatic.gtest already has CMAKE_BUILD_SHARED set to OFF. --- pkgs/development/libraries/gtest/default.nix | 5 ++--- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/static.nix | 3 --- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/development/libraries/gtest/default.nix index 4326be59724..bbc582f581c 100644 --- a/pkgs/development/libraries/gtest/default.nix +++ b/pkgs/development/libraries/gtest/default.nix @@ -1,5 +1,4 @@ -{ stdenv, cmake, ninja, fetchFromGitHub -, static ? false }: +{ stdenv, cmake, ninja, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "gtest"; @@ -20,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja ]; - cmakeFlags = stdenv.lib.optional (!static) "-DBUILD_SHARED_LIBS=ON"; + cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; meta = with stdenv.lib; { description = "Google's framework for writing C++ tests"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3c4bfa4d9cc..b58bd06f71a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10787,7 +10787,7 @@ in arrayfire = callPackage ../development/libraries/arrayfire {}; 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 = overrideCC stdenv buildPackages.gcc6; # hidden symbol `__divmoddi4' }); diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index ffb2d294437..aa31996b872 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -196,9 +196,6 @@ in { glog = super.glog.override { static = true; }; - gtest = super.gtest.override { - static = true; - }; cdo = super.cdo.override { enable_all_static = true; }; From 4541012bdbcb5da522e056b75808fa5fa263fc23 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 3 Jan 2020 11:37:39 -0500 Subject: [PATCH 20/37] glog: remove the "static" option pkgsStatic.glog already has CMAKE_BUILD_SHARED set to OFF. --- pkgs/development/libraries/glog/default.nix | 4 ++-- pkgs/top-level/static.nix | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/glog/default.nix b/pkgs/development/libraries/glog/default.nix index 7809dc08842..04846c3ab42 100644 --- a/pkgs/development/libraries/glog/default.nix +++ b/pkgs/development/libraries/glog/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, perl, static ? false }: +{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, perl }: stdenv.mkDerivation rec { pname = "glog"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" ]; + cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; checkInputs = [ perl ]; doCheck = false; # fails with "Mangled symbols (28 out of 380) found in demangle.dm" diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index aa31996b872..8886e6bb9b4 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -193,9 +193,6 @@ in { gflags = super.gflags.override { enableShared = false; }; - glog = super.glog.override { - static = true; - }; cdo = super.cdo.override { enable_all_static = true; }; From bb890c45612a14e7f9fb8bc08d24e6d0a5d0402c Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 3 Jan 2020 11:44:23 -0500 Subject: [PATCH 21/37] double-conversion: remove the "static" option pkgsStatic.double-conversion already has CMAKE_BUILD_SHARED set to OFF. --- pkgs/development/libraries/double-conversion/default.nix | 4 ++-- pkgs/top-level/static.nix | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/double-conversion/default.nix b/pkgs/development/libraries/double-conversion/default.nix index 4d8f623b36a..ecd5ee67cf6 100644 --- a/pkgs/development/libraries/double-conversion/default.nix +++ b/pkgs/development/libraries/double-conversion/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, static ? false }: +{ stdenv, lib, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "double-conversion"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" ]; + cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; # Case sensitivity issue preConfigure = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index 8886e6bb9b4..bcf68b17a66 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -184,9 +184,6 @@ in { static = true; twisted = null; }; - double-conversion = super.double-conversion.override { - static = true; - }; gmp = super.gmp.override { withStatic = true; }; From 28c37155d7606db382afb2210b611525a3dca5d5 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 15 Oct 2019 19:14:33 -0400 Subject: [PATCH 22/37] xcode: Add more hashes, and fix some old ones --- pkgs/os-specific/darwin/xcode/default.nix | 8 +++++++- pkgs/top-level/darwin-packages.nix | 8 ++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix index 62785f34fe8..3b60ccb64fd 100644 --- a/pkgs/os-specific/darwin/xcode/default.nix +++ b/pkgs/os-specific/darwin/xcode/default.nix @@ -45,7 +45,13 @@ in lib.makeExtensible (self: { xcode_8_2 = requireXcode "8.2" "13nd1zsfqcp9hwp15hndr0rsbb8rgprrz7zr2ablj4697qca06m2"; xcode_9_1 = requireXcode "9.1" "0ab1403wy84ys3yn26fj78cazhpnslmh3nzzp1wxib3mr1afjvic"; 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_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 "8.2")}"; }) diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index 5ef05061e8d..9423aa30725 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -68,8 +68,12 @@ in usr-include = callPackage ../os-specific/darwin/usr-include { }; - inherit (callPackages ../os-specific/darwin/xcode { } ) - xcode_8_1 xcode_8_2 xcode_9_1 xcode_9_2 xcode_9_4 xcode; + inherit (callPackages ../os-specific/darwin/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 { }; From 3432b1baa8612d1dfcb750e4bc8f27b171b8ee1a Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 25 Nov 2019 23:50:21 -0500 Subject: [PATCH 23/37] =?UTF-8?q?xcode:=20don=E2=80=99t=20use=20libstdc++?= =?UTF-8?q?=20on=20iOS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Apple no longer ships with it, so best to avoid forcing it into use. --- pkgs/os-specific/darwin/xcode/sdk-pkgs.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix index d25edff4956..e8302a82555 100644 --- a/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix +++ b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix @@ -7,6 +7,7 @@ , wrapCCWith , buildIosSdk, targetIosSdkPkgs , xcode +, lib }: let @@ -48,7 +49,7 @@ rec { tr '\n' ' ' < $out/nix-support/cc-cflags > cc-cflags.tmp mv cc-cflags.tmp $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") '' echo "-mios-simulator-version-min=${minSdkVersion}" >> $out/nix-support/cc-cflags '' + stdenv.lib.optionalString (sdk.platform == "iPhoneOS") '' From 036cef94733d2af03f3732eb8673cf0744303972 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 3 Dec 2019 13:01:29 -0500 Subject: [PATCH 24/37] ghc: always use llvm with iOS Even when building for the simulator. --- pkgs/development/compilers/ghc/8.4.4.nix | 2 +- pkgs/development/compilers/ghc/8.6.5.nix | 2 +- pkgs/development/compilers/ghc/8.8.1.nix | 2 +- pkgs/development/compilers/ghc/head.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/ghc/8.4.4.nix b/pkgs/development/compilers/ghc/8.4.4.nix index 52fb926cdc6..96ad43e2e05 100644 --- a/pkgs/development/compilers/ghc/8.4.4.nix +++ b/pkgs/development/compilers/ghc/8.4.4.nix @@ -7,7 +7,7 @@ , 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 # non-x86, we need LLVM to bootstrap later stages, so it becomes a # build-time dependency too. diff --git a/pkgs/development/compilers/ghc/8.6.5.nix b/pkgs/development/compilers/ghc/8.6.5.nix index cdbcb8e1aed..ae6a870bd4e 100644 --- a/pkgs/development/compilers/ghc/8.6.5.nix +++ b/pkgs/development/compilers/ghc/8.6.5.nix @@ -10,7 +10,7 @@ , # GHC can be built with system libffi or a bundled one. libffi ? null -, useLLVM ? !stdenv.targetPlatform.isx86 +, useLLVM ? !stdenv.targetPlatform.isx86 || stdenv.targetPlatform.isiOS , # LLVM is conceptually a run-time-only depedendency, but for # non-x86, we need LLVM to bootstrap later stages, so it becomes a # build-time dependency too. diff --git a/pkgs/development/compilers/ghc/8.8.1.nix b/pkgs/development/compilers/ghc/8.8.1.nix index 95bbab3cb3e..5719548a012 100644 --- a/pkgs/development/compilers/ghc/8.8.1.nix +++ b/pkgs/development/compilers/ghc/8.8.1.nix @@ -10,7 +10,7 @@ , # GHC can be built with system libffi or a bundled one. libffi ? null -, useLLVM ? !stdenv.targetPlatform.isx86 +, useLLVM ? !stdenv.targetPlatform.isx86 || stdenv.targetPlatform.isiOS , # LLVM is conceptually a run-time-only depedendency, but for # non-x86, we need LLVM to bootstrap later stages, so it becomes a # build-time dependency too. diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index b78f5bc2204..159e05fa777 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -7,7 +7,7 @@ , libiconv ? null, ncurses -, useLLVM ? !stdenv.targetPlatform.isx86 +, useLLVM ? !stdenv.targetPlatform.isx86 || stdenv.targetPlatform.isiOS , # LLVM is conceptually a run-time-only depedendency, but for # non-x86, we need LLVM to bootstrap later stages, so it becomes a # build-time dependency too. From 010d2f4aa29448b1908b954006484cfbbf7e7d50 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 25 Nov 2019 21:53:22 -0500 Subject: [PATCH 25/37] lib/systems: use newer ios sdk --- lib/systems/examples.nix | 16 ++++++++-------- pkgs/os-specific/darwin/xcode/default.nix | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 585156c2475..f20b37dbb7a 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -164,8 +164,8 @@ rec { iphone64 = { config = "aarch64-apple-ios"; # config = "aarch64-apple-darwin14"; - sdkVer = "10.2"; - xcodeVer = "8.2"; + sdkVer = "12.4"; + xcodeVer = "10.3"; xcodePlatform = "iPhoneOS"; useiOSPrebuilt = true; platform = {}; @@ -174,8 +174,8 @@ rec { iphone32 = { config = "armv7a-apple-ios"; # config = "arm-apple-darwin10"; - sdkVer = "10.2"; - xcodeVer = "8.2"; + sdkVer = "12.4"; + xcodeVer = "10.3"; xcodePlatform = "iPhoneOS"; useiOSPrebuilt = true; platform = {}; @@ -184,8 +184,8 @@ rec { iphone64-simulator = { config = "x86_64-apple-ios"; # config = "x86_64-apple-darwin14"; - sdkVer = "10.2"; - xcodeVer = "8.2"; + sdkVer = "12.4"; + xcodeVer = "10.3"; xcodePlatform = "iPhoneSimulator"; useiOSPrebuilt = true; platform = {}; @@ -194,8 +194,8 @@ rec { iphone32-simulator = { config = "i686-apple-ios"; # config = "i386-apple-darwin11"; - sdkVer = "10.2"; - xcodeVer = "8.2"; + sdkVer = "12.4"; + xcodeVer = "10.3"; xcodePlatform = "iPhoneSimulator"; useiOSPrebuilt = true; platform = {}; diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix index 3b60ccb64fd..282afe13c34 100644 --- a/pkgs/os-specific/darwin/xcode/default.nix +++ b/pkgs/os-specific/darwin/xcode/default.nix @@ -53,5 +53,5 @@ in lib.makeExtensible (self: { 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 "8.2")}"; + xcode = self."xcode_${lib.replaceStrings ["."] ["_"] (if stdenv.targetPlatform.useiOSPrebuilt then stdenv.targetPlatform.xcodeVer else "10.3")}"; }) From 6f8b2f3961ef19298cccce24faea0af15b0493eb Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 25 Nov 2019 21:48:26 -0500 Subject: [PATCH 26/37] cctools: only add libtool on native builds libtool is not really needed and it interferes with updateAutotoolsGnuConfigScriptsHook. So remove it when cross-compiling, but leave it in native to preserve hashes. --- pkgs/os-specific/darwin/cctools/port.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix index ff8f3eb5e26..07e38b0b015 100644 --- a/pkgs/os-specific/darwin/cctools/port.nix +++ b/pkgs/os-specific/darwin/cctools/port.nix @@ -30,7 +30,12 @@ let outputs = [ "out" "dev" ]; - nativeBuildInputs = [ autoconf automake libtool autoreconfHook ]; + nativeBuildInputs = [ autoconf automake ] + + # TODO: remove on next hash change, libtool is unnecessary with autoreconfHook + ++ stdenv.lib.optional (stdenv.targetPlatform == stdenv.hostPlatform) libtool + + ++ [ autoreconfHook ]; buildInputs = [ libuuid ] ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi libobjc ] ++ stdenv.lib.optional enableTapiSupport libtapi; From 8b41b16a9f1210d8a4556a9c412072fffbf4fb95 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 26 Nov 2019 16:41:18 -0500 Subject: [PATCH 27/37] cctools: fixup gnu-config detection --- pkgs/os-specific/darwin/cctools/port.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix index 07e38b0b015..ff8f3eb5e26 100644 --- a/pkgs/os-specific/darwin/cctools/port.nix +++ b/pkgs/os-specific/darwin/cctools/port.nix @@ -30,12 +30,7 @@ let outputs = [ "out" "dev" ]; - nativeBuildInputs = [ autoconf automake ] - - # TODO: remove on next hash change, libtool is unnecessary with autoreconfHook - ++ stdenv.lib.optional (stdenv.targetPlatform == stdenv.hostPlatform) libtool - - ++ [ autoreconfHook ]; + nativeBuildInputs = [ autoconf automake libtool autoreconfHook ]; buildInputs = [ libuuid ] ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi libobjc ] ++ stdenv.lib.optional enableTapiSupport libtapi; From 1b591acf6b4e5d7c26263b64a036a86ee92faf54 Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Fri, 3 Jan 2020 20:08:25 -0500 Subject: [PATCH 28/37] ffmpeg: fix cross compilation --- pkgs/development/libraries/ffmpeg/generic.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 956d2d7223f..26a3206d205 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -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 , libssh, libtheora, libva, libdrm, libvorbis, libvpx, lzma, libpulseaudio, soxr , x264, x265, xvidcore, zlib, libopus, speex, nv-codec-headers, dav1d @@ -163,8 +163,10 @@ stdenv.mkDerivation rec { ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--cross-prefix=${stdenv.cc.targetPrefix}" "--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"); + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ addOpenGLRunpath perl pkgconfig texinfo yasm ]; buildInputs = [ From 7d46f7363cab9df64643eddffd371d654d816919 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 4 Jan 2020 08:24:30 +0000 Subject: [PATCH 29/37] Revert "ffmpeg: fix cross compilation" This reverts commit f6f8f0b75a40da0ab572ecdf891f4394b44c3783. avoid mass-rebuild on master; move to staging instead. --- pkgs/development/libraries/ffmpeg/generic.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 26a3206d205..956d2d7223f 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, fetchurl, pkgconfig, addOpenGLRunpath, perl, texinfo, yasm +{ stdenv, fetchurl, pkgconfig, addOpenGLRunpath, perl, texinfo, yasm , alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg , libssh, libtheora, libva, libdrm, libvorbis, libvpx, lzma, libpulseaudio, soxr , x264, x265, xvidcore, zlib, libopus, speex, nv-codec-headers, dav1d @@ -163,10 +163,8 @@ stdenv.mkDerivation rec { ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--cross-prefix=${stdenv.cc.targetPrefix}" "--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"); - depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ addOpenGLRunpath perl pkgconfig texinfo yasm ]; buildInputs = [ From 1a931f1f60fb14d5bd485f85ee344a570cdcb50c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 4 Jan 2020 08:26:03 +0000 Subject: [PATCH 30/37] Revert "Revert "ffmpeg: fix cross compilation"" This reverts commit 7d46f7363cab9df64643eddffd371d654d816919. This change was accidentally commit to master. To avoid a mass-rebuild we actually apply this change on staging first. --- pkgs/development/libraries/ffmpeg/generic.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 956d2d7223f..26a3206d205 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -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 , libssh, libtheora, libva, libdrm, libvorbis, libvpx, lzma, libpulseaudio, soxr , x264, x265, xvidcore, zlib, libopus, speex, nv-codec-headers, dav1d @@ -163,8 +163,10 @@ stdenv.mkDerivation rec { ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--cross-prefix=${stdenv.cc.targetPrefix}" "--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"); + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ addOpenGLRunpath perl pkgconfig texinfo yasm ]; buildInputs = [ From a3f40b507f63798d8893acc783345bb36f5c3795 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 4 Jan 2020 15:24:43 +0100 Subject: [PATCH 31/37] pythonPackages.setuptools: 42.0.2 -> 44.0.0 --- pkgs/development/python-modules/setuptools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index f52a4931377..194b90cb42a 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -13,7 +13,7 @@ let pname = "setuptools"; - version = "42.0.2"; + version = "44.0.0"; # Create an sdist of setuptools sdist = stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ let owner = "pypa"; repo = pname; rev = "v${version}"; - sha256 = "1xqx3sha5ir40g1h15r7q063bcbl9bvh967vig574k3jgwxrz2ik"; + sha256 = "0z3q0qinyp1rmnxkw3y5f6nbsxhqlfq5k7skfrqa6ymb3zr009y1"; name = "${pname}-${version}-source"; }; From 07ceb05628371a99c938ea0c304939244e2cdcc4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 4 Jan 2020 15:27:03 +0100 Subject: [PATCH 32/37] Docs: document we have python38 --- doc/languages-frameworks/python.section.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 9cb0e1eecc1..9b2e1909e66 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -496,8 +496,8 @@ and in this case the `python35` interpreter is automatically used. ### Interpreters -Versions 2.7, 3.5, 3.6 and 3.7 of the CPython interpreter are available as -respectively `python27`, `python35`, `python36` and `python37`. The aliases +Versions 2.7, 3.5, 3.6, 3.7 and 3.8 of the CPython interpreter are available as +respectively `python27`, `python35`, `python36`, `python37` and `python38`. The aliases `python2` and `python3` correspond to respectively `python27` and `python37`. The default interpreter, `python`, maps to `python2`. The PyPy interpreters compatible with Python 2.7 and 3 are available as `pypy27` and From 2dc4ab36772dfaf124af4d90e99c68038f46baa0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 4 Jan 2020 15:27:48 +0100 Subject: [PATCH 33/37] python3: now points to python38 --- doc/languages-frameworks/python.section.md | 2 +- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 9b2e1909e66..1a11488475e 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -499,7 +499,7 @@ and in this case the `python35` interpreter is automatically used. Versions 2.7, 3.5, 3.6, 3.7 and 3.8 of the CPython interpreter are available as respectively `python27`, `python35`, `python36`, `python37` and `python38`. The aliases `python2` and `python3` correspond to respectively `python27` and -`python37`. The default interpreter, `python`, maps to `python2`. The PyPy +`python38`. The default interpreter, `python`, maps to `python2`. The PyPy interpreters compatible with Python 2.7 and 3 are available as `pypy27` and `pypy3`, with aliases `pypy2` mapping to `pypy27` and `pypy` mapping to `pypy2`. The Nix expressions for the interpreters can be diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3c4bfa4d9cc..b11ef525791 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9246,7 +9246,7 @@ in # When switching these sets, please update docs at ../../doc/languages-frameworks/python.md python = python2; python2 = python27; - python3 = python37; + python3 = python38; pypy = pypy2; pypy2 = pypy27; pypy3 = pypy36; From d8369edfcda8bc253694e70b4d164c15525dbbc8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 4 Jan 2020 23:22:29 +0100 Subject: [PATCH 34/37] docbook-xsl: Fix reproducibility when building docs When building docs generate.consistent.ids was not respected for indexes. https://github.com/docbook/xslt10-stylesheets/pull/88 https://sourceforge.net/p/docbook/bugs/1385/ This lead to r13y failures in udisks2.devdoc. --- .../sgml+xml/stylesheets/xslt/docbook-xsl/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix index 5297d5dbd5d..8aa1f0b6330 100644 --- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix +++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix @@ -22,6 +22,15 @@ let 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 (substituteAll { src = ./catalog-legacy-uris.patch; From 7f8111955082b4aa7dce2718b9ef4d8ad0f4584b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 6 Jan 2020 19:12:20 +0100 Subject: [PATCH 35/37] libapparmor: support python 3.8 --- pkgs/os-specific/linux/apparmor/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index 7030bc0ca31..de9601dc85e 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -51,6 +51,11 @@ let # (alpine patches {1,4,5,6,8} are needed for apparmor 2.11, but not 2.12) ] ++ [ ./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 From eb1369670b5a4e616ff0cf4100616479b1fa3064 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 10 Jan 2020 10:33:40 +0100 Subject: [PATCH 36/37] Revert "python3: now points to python38" This is going to require more work. This reverts commit 2dc4ab36772dfaf124af4d90e99c68038f46baa0. --- doc/languages-frameworks/python.section.md | 2 +- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index dc5fdd24aaa..199e678bc29 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -499,7 +499,7 @@ and in this case the `python35` interpreter is automatically used. Versions 2.7, 3.5, 3.6, 3.7 and 3.8 of the CPython interpreter are available as respectively `python27`, `python35`, `python36`, `python37` and `python38`. The aliases `python2` and `python3` correspond to respectively `python27` and -`python38`. 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 `pypy3`, with aliases `pypy2` mapping to `pypy27` and `pypy` mapping to `pypy2`. The Nix expressions for the interpreters can be diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 93ed4285c29..1aded22161c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9267,7 +9267,7 @@ in # When switching these sets, please update docs at ../../doc/languages-frameworks/python.md python = python2; python2 = python27; - python3 = python38; + python3 = python37; pypy = pypy2; pypy2 = pypy27; pypy3 = pypy36; From e4a75b0f32819d9d5c303890e97d45beee629ebb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 11 Jan 2020 09:20:25 +0100 Subject: [PATCH 37/37] Revert "python3Packages.hypothesis: 4.41.0 -> 4.56.1" This updated only the version, not the hash. https://github.com/NixOS/nixpkgs/pull/77372 This reverts commit 046c4020a5ab572371f3beed1951455fe0d6198f. --- pkgs/development/python-modules/hypothesis/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index fdb5a69ddd7..9e3b0cdc894 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { # pytz fake_factory django numpy pytest # If you need these, you can just add them to your environment. - version = "4.56.1"; + version = "4.41.0"; pname = "hypothesis"; # Use github tarballs that includes tests