From 16c0697e6822b360c3f538fcd443046ea3f3b6fc Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Sat, 19 Dec 2020 01:44:46 +0100 Subject: [PATCH 1/9] linux: fix generate-config's handling of "no-choice" options Prior to this change, the script could potentially get confused by "menus" containing only one valid option. Thus, with CPU_BIG_ENDIAN = no; CPU_LITTLE_ENDIAN = yes; ARM64_PA_BITS_48 = yes; the endianness would be set incorrectly: GOT: Physical address space size GOT: > 1. 48-bit (ARM64_PA_BITS_48) GOT: choice[1]: 1 GOT: Endianness GOT: 1. Build big-endian kernel (CPU_BIG_ENDIAN) GOT: > 2. Build little-endian kernel (CPU_LITTLE_ENDIAN) CHOICE: 1-2?, ANSWER: 1 This commit fixes this error by forgetting previous menu choices if a line that follows a menu option is neither another menu option nor the prompt for choosing one of the options. --- pkgs/os-specific/linux/kernel/generate-config.pl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/generate-config.pl b/pkgs/os-specific/linux/kernel/generate-config.pl index 26c559ea9086..6a2aec809a1b 100644 --- a/pkgs/os-specific/linux/kernel/generate-config.pl +++ b/pkgs/os-specific/linux/kernel/generate-config.pl @@ -61,6 +61,12 @@ sub runConfig { # Remember choice alternatives ("> 1. bla (FOO)" or " 2. bla (BAR) (NEW)"). if ($line =~ /^\s*>?\s*(\d+)\.\s+.*?\(([A-Za-z0-9_]+)\)(?:\s+\(NEW\))?\s*$/) { $choices{$2} = $1; + } else { + # The list of choices has ended without us being + # asked. This happens for options where only one value + # is valid, for instance. The results can foul up + # later options, so forget about it. + %choices = (); } $line = ""; From 0e0900cba509da351dbc3eb9ca9757154803d7f8 Mon Sep 17 00:00:00 2001 From: zeripath Date: Mon, 11 Jan 2021 18:09:14 +0000 Subject: [PATCH 2/9] gitea: add sqlite_unlock_notify build tag Fix #109004 When building Gitea with sqlite support the sqlite_unlock_notify tag must also be added otherwise there will be frequent error reports of database is locked. --- pkgs/applications/version-management/gitea/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index ffbeb050956d..528e7c3dd995 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -37,7 +37,7 @@ buildGoPackage rec { preBuild = let tags = optional pamSupport "pam" - ++ optional sqliteSupport "sqlite"; + ++ optional sqliteSupport "sqlite sqlite_unlock_notify"; tagsString = concatStringsSep " " tags; in '' export buildFlagsArray=( From 2679f31ad15505b36c5568d228f565841981c9f9 Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Mon, 11 Jan 2021 23:00:59 +0100 Subject: [PATCH 3/9] oraclejdk8: 8u261 -> 8u271 --- .../development/compilers/oraclejdk/jdk-linux-base.nix | 2 +- pkgs/development/compilers/oraclejdk/jdk8-linux.nix | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index 78fff4a59fba..17030cf5bf1e 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -76,7 +76,7 @@ let result = stdenv.mkDerivation rec { i686-linux = "linux-i586"; x86_64-linux = "linux-x64"; armv7l-linux = "linux-arm32-vfp-hflt"; - aarch64-linux = "linux-arm64-vfp-hflt"; + aarch64-linux = "linux-aarch64"; }.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); in requireFile { name = "jdk-${productVersion}u${patchVersion}-${platformName}.tar.gz"; diff --git a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix index fdea10dcd7e4..01d1ee8e980c 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix @@ -1,10 +1,10 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "261"; - sha256.i686-linux = "1bl12hd5i53m8d4j8rwkk3bavmzw0ndr88ch5lf5syi7vs5pfjpm"; - sha256.x86_64-linux = "0d7a92csz8ws5h0pzqmrxq3sz286s57vw0dqq3ciwsqz14df012s"; - sha256.armv7l-linux = "13dih7zyfgj90bkhnfxhpm88d9kqqrj6w5rzpidmxrjwrsnlndp9"; - sha256.aarch64-linux = "0zzhs4pcnjss2561b8zrrnacpkb8p49ca0lpdw7hzgsjjj1y146n"; + patchVersion = "271"; + sha256.i686-linux = "nC1bRTDj0BPWqClLCfNIqdUn9HywUF8Z/pIV9Kq3LG0="; + sha256.x86_64-linux = "66eSamg7tlxvThxQLOYkNGxCsA+1Ux3ropbyVgtFLHg="; + sha256.armv7l-linux = "YZKX0iUf7yqUBUhlpHtVdYw6DBEu7E/pbfcVfK7HMxM="; + sha256.aarch64-linux = "bFRGnfmYIdXz5b/I8wlA/YiGXhCm/cVoOAU+Hlu4F0I="; jceName = "jce_policy-8.zip"; sha256JCE = "19n5wadargg3v8x76r7ayag6p2xz1bwhrgdzjs9f4i6fvxz9jr4w"; } From d88ad75767c638c013f5db40739386b1a5e12029 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 11 Jan 2021 22:27:06 +0100 Subject: [PATCH 4/9] gnupg: 2.2.26 -> 2.2.27 Announcement: https://lists.gnupg.org/pipermail/gnupg-announce/2021q1/000452.html Luckily this fixes a regression from GnuPG 2.2.26 that broke the build of libsForQt5.qgpgme (a test failed). Fix #109009. --- pkgs/tools/security/gnupg/22.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index 94e62c03ad3b..a6b0d43aae21 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -16,11 +16,11 @@ assert guiSupport -> pinentry != null && enableMinimal == false; stdenv.mkDerivation rec { pname = "gnupg"; - version = "2.2.26"; + version = "2.2.27"; src = fetchurl { url = "mirror://gnupg/gnupg/${pname}-${version}.tar.bz2"; - sha256 = "0vgzrwafi4s4q5ixn4inwm0ir6acz405kghnvxsj3lpsr7k6jxai"; + sha256 = "1693s2rp9sjwvdslj94n03wnb6rxysjy0dli0q1698af044h1ril"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; From 02f64b7081a63921ff6cc57dc84af294089dd8da Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 11 Jan 2021 18:29:59 -0800 Subject: [PATCH 5/9] python3Packages.xmlschema: 1.3.1 -> 1.4.1 --- pkgs/development/python-modules/xmlschema/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xmlschema/default.nix b/pkgs/development/python-modules/xmlschema/default.nix index 55b45fb51714..e31054e74c13 100644 --- a/pkgs/development/python-modules/xmlschema/default.nix +++ b/pkgs/development/python-modules/xmlschema/default.nix @@ -5,14 +5,14 @@ }: buildPythonPackage rec { - version = "1.3.1"; + version = "1.4.1"; pname = "xmlschema"; src = fetchFromGitHub { owner = "sissaschool"; repo = "xmlschema"; rev = "v${version}"; - sha256 = "08p6fm15600h40r5h7f3gfv34cys481f89pf57dv3y8gf6y2if56"; + sha256 = "1yd7whf74z8bw99gldxlnrs8bjnjzald29b5cf2ka0i144sxbvad"; }; propagatedBuildInputs = [ elementpath ]; From 3fe3dcd92e309eda64fc39d7ed0cdbcda306474e Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 11 Jan 2021 19:15:31 -0800 Subject: [PATCH 6/9] python3Packages.pandas: fix tests Tests now have relative imports to other test files, so pytest needs to be executed in the $out/${python.sitePackages}/pandas directory to make these assumptions valid --- pkgs/development/python-modules/pandas/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 3db271ee9986..b9865fe628b0 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -85,7 +85,6 @@ in buildPythonPackage rec { doCheck = !stdenv.isAarch64; # upstream doesn't test this architecture pytestFlagsArray = [ - "$out/${python.sitePackages}/pandas" "--skip-slow" "--skip-network" ]; @@ -120,7 +119,10 @@ in buildPythonPackage rec { "test_clipboard" ]; + # tests have relative paths, and need to reference compiled C extensions + # so change directory where `import .test` is able to be resolved preCheck = '' + cd $out/${python.sitePackages}/pandas export LC_ALL="en_US.UTF-8" PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH '' From 5cbe85dbd8e2c648753e4b3e65d74e3a7506431c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 5 Jan 2021 08:57:55 +0100 Subject: [PATCH 7/9] ocamlPackages.ppx_gen_rec: use Dune 2 --- pkgs/development/ocaml-modules/ppx_gen_rec/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix b/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix index a5531813c42f..01c98b7f7625 100644 --- a/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix +++ b/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix @@ -4,7 +4,7 @@ buildDunePackage rec { pname = "ppx_gen_rec"; version = "1.1.0"; - minimumOCamlVersion = "4.01"; + useDune2 = true; src = fetchurl { url = "https://github.com/flowtype/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; From a8c07163dc9d62c9d1156e44501f2af095fec607 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 12 Jan 2021 12:18:19 +0100 Subject: [PATCH 8/9] xsd: fix build last release 2014... does not build with gcc10 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 264fe101a513..eab5ce66db05 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25681,7 +25681,9 @@ in xrgears = callPackage ../applications/graphics/xrgears { }; - xsd = callPackage ../development/libraries/xsd { }; + xsd = callPackage ../development/libraries/xsd { + stdenv = gcc9Stdenv; + }; xscope = callPackage ../applications/misc/xscope { }; From 37edb33d925d959d07a55ad861c5b9313aeae28f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 12 Jan 2021 12:18:50 +0100 Subject: [PATCH 9/9] xsd: modernize build --- pkgs/development/libraries/xsd/default.nix | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/xsd/default.nix b/pkgs/development/libraries/xsd/default.nix index 7541ee427045..3388666f46b3 100644 --- a/pkgs/development/libraries/xsd/default.nix +++ b/pkgs/development/libraries/xsd/default.nix @@ -1,9 +1,8 @@ { stdenv, fetchurl, xercesc }: let - fixed_paths = ''LDFLAGS="-L${xercesc}/lib" CPPFLAGS="-I${xercesc}/include"''; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "xsd"; version = "4.0.0"; @@ -14,20 +13,22 @@ stdenv.mkDerivation { patches = [ ./xsdcxx.patch ]; - configurePhase = '' + postPatch = '' patchShebangs . ''; - buildPhase = '' - make ${fixed_paths} - ''; + enableParallelBuilding = true; + + buildFlags = [ + "LDFLAGS=-L${xercesc}/lib" + "CPPFLAGS=-I${xercesc}/include" + ]; + installFlags = buildFlags ++ [ + "install_prefix=${placeholder "out"}" + ]; buildInputs = [ xercesc ]; - installPhase = '' - make ${fixed_paths} install_prefix="$out" install - ''; - meta = { homepage = "http://www.codesynthesis.com/products/xsd"; description = "An open-source, cross-platform W3C XML Schema to C++ data binding compiler";