From 3af3ca8cc23b771c2550c54f6dfcc0b9952052d0 Mon Sep 17 00:00:00 2001 From: "Zak B. Elep" Date: Sat, 4 Sep 2021 22:54:13 +0800 Subject: [PATCH 01/10] perlPackages.PkgConfig: fix cross compilation Change the way we source $PkgConfig::VERSION to avoid loading unnecessary libraries during cross-build. --- pkgs/top-level/perl-packages.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e4331bc9bc4c..11fb2d4ccd46 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -17207,13 +17207,19 @@ let }; }; - PkgConfig = buildPerlPackage { + PkgConfig = buildPerlPackage rec { pname = "PkgConfig"; version = "0.25026"; src = fetchurl { url = "mirror://cpan/authors/id/P/PL/PLICEASE/PkgConfig-0.25026.tar.gz"; sha256 = "1862hzlkibqsgynrnwg43acycp4rlsv19gsybjwq39nnqb9mxfjd"; }; + # support cross-compilation by simplifying the way we get version during build + postPatch = '' + substituteInPlace Makefile.PL --replace \ + 'do { require "./lib/PkgConfig.pm"; $PkgConfig::VERSION; }' \ + '"${version}"' + ''; meta = { description = "Pure-Perl Core-Only replacement for pkg-config"; license = with lib.licenses; [ artistic1 gpl1Plus ]; From 7357a87d93e090d32971a93fc4d46e5f59888605 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 5 Sep 2021 10:07:22 +0200 Subject: [PATCH 02/10] python3Packages.pyezviz: 0.1.9.2 -> 0.1.9.3 --- pkgs/development/python-modules/pyezviz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyezviz/default.nix b/pkgs/development/python-modules/pyezviz/default.nix index 1c2593d5a6df..47337335fb6c 100644 --- a/pkgs/development/python-modules/pyezviz/default.nix +++ b/pkgs/development/python-modules/pyezviz/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pyezviz"; - version = "0.1.9.2"; + version = "0.1.9.3"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "baqs"; repo = "pyEzviz"; rev = version; - sha256 = "sha256-t5b2PuHC+ZY2uh+ryS+bjTS7kReZi0Rvlvkr98JFyH4="; + sha256 = "sha256-TDFkEz8I0/YoAFhWSYkLqL4+R4yiqAu+QncEieAlh2A="; }; propagatedBuildInputs = [ From 7dc83f03fa341ddb5743e28ca3a0866b6a8d4790 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 5 Sep 2021 10:15:02 +0200 Subject: [PATCH 03/10] python3Packages.simplisafe-python: 11.0.5 -> 11.0.6 --- pkgs/development/python-modules/simplisafe-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/simplisafe-python/default.nix b/pkgs/development/python-modules/simplisafe-python/default.nix index d79b741d278e..09f7a3056fbd 100644 --- a/pkgs/development/python-modules/simplisafe-python/default.nix +++ b/pkgs/development/python-modules/simplisafe-python/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "simplisafe-python"; - version = "11.0.5"; + version = "11.0.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-QLxp7WrYXJDGVG/MZ+GpvzYZ8gyLwconqikgs581voI="; + sha256 = "sha256-XVn/GBcTTthvsRJOnCZ0yOF3nUwbBZ2dfMJZsJXnE6U="; }; nativeBuildInputs = [ poetry-core ]; From 03637fe5869c1f854ad05c6d301812eda3ac1761 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sun, 5 Sep 2021 22:30:50 +0200 Subject: [PATCH 04/10] sdlpop: 1.21 -> 1.22 + fix build on darwin --- pkgs/games/sdlpop/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/games/sdlpop/default.nix b/pkgs/games/sdlpop/default.nix index cef321fdce4e..f9b91e3dc158 100644 --- a/pkgs/games/sdlpop/default.nix +++ b/pkgs/games/sdlpop/default.nix @@ -8,22 +8,25 @@ stdenv.mkDerivation rec { pname = "sdlpop"; - version = "1.21"; + version = "1.22"; src = fetchFromGitHub { owner = "NagyD"; repo = "SDLPoP"; rev = "v${version}"; - sha256 = "1q4mnyg8v4420f1bp24v8lgi335vijdv61yi3fan14jgfzl38l7w"; + sha256 = "1yy5r1r0hv0xggk8qd8bwk2zy7abpv89nikq4flqgi53fc5q9xl7"; }; nativeBuildInputs = [ pkg-config makeWrapper copyDesktopItems ]; + buildInputs = [ SDL2 SDL2_image ]; makeFlags = [ "-C" "src" ]; preBuild = '' - substituteInPlace src/Makefile --replace "CC = gcc" "CC = ${stdenv.cc.targetPrefix}gcc" + substituteInPlace src/Makefile \ + --replace "CC = gcc" "CC = ${stdenv.cc.targetPrefix}cc" \ + --replace "CFLAGS += -I/opt/local/include" "CFLAGS += -I${SDL2.dev}/include/SDL2 -I${SDL2_image}/include/SDL2" ''; # The prince binary expects two things of the working directory it is called from: @@ -63,6 +66,5 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ iblech ]; platforms = platforms.unix; - broken = stdenv.isDarwin; }; } From 560f823ebb24f40381b1f2972302f2dd913647ca Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 5 Sep 2021 22:50:05 +0200 Subject: [PATCH 05/10] python3Packages.bidict: 0.21.2 -> 0.21.3 --- .../python-modules/bidict/default.nix | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/bidict/default.nix b/pkgs/development/python-modules/bidict/default.nix index 8ad3534170d5..8e32a0830035 100644 --- a/pkgs/development/python-modules/bidict/default.nix +++ b/pkgs/development/python-modules/bidict/default.nix @@ -1,5 +1,6 @@ -{ lib, buildPythonPackage, fetchPypi -, setuptools-scm +{ lib +, buildPythonPackage +, fetchPypi , sphinx , hypothesis , py @@ -7,21 +8,23 @@ , pytest-benchmark , sortedcollections , sortedcontainers -, isPy3k +, pythonOlder }: buildPythonPackage rec { pname = "bidict"; - version = "0.21.2"; - disabled = !isPy3k; + version = "0.21.3"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "4fa46f7ff96dc244abfc437383d987404ae861df797e2fd5b190e233c302be09"; + sha256 = "sha256-1QvYH65140GY/8lJeaDrCTn/mts+8yvMk6kT2LPj7R0="; }; - nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ sphinx ]; + propagatedBuildInputs = [ + sphinx + ]; checkInputs = [ hypothesis @@ -32,6 +35,8 @@ buildPythonPackage rec { sortedcontainers ]; + pythonImportsCheck = [ "bidict" ]; + meta = with lib; { homepage = "https://github.com/jab/bidict"; description = "Efficient, Pythonic bidirectional map data structures and related functionality"; From 030bed204a4c9beffa1e8126624b0b92d217b904 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 5 Sep 2021 23:22:19 +0200 Subject: [PATCH 06/10] python3Packages.pyvicare: 2.7.1 -> 2.8 --- pkgs/development/python-modules/pyvicare/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvicare/default.nix b/pkgs/development/python-modules/pyvicare/default.nix index 6da6b7803828..50a0b4130225 100644 --- a/pkgs/development/python-modules/pyvicare/default.nix +++ b/pkgs/development/python-modules/pyvicare/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pyvicare"; - version = "2.7.1"; + version = "2.8"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "somm15"; repo = "PyViCare"; rev = version; - sha256 = "sha256-YczzB95RyOdRGEye1pUqCZxegtp6kjCtUUHYyHD0WP0="; + sha256 = "sha256-mVuwajfY5IAhu6giGrgWw17MDexmR2JDT/9iL3nqJrM="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 30a7899eed026c1f42438207a9626c2647a7f2cb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 6 Sep 2021 05:40:29 +0000 Subject: [PATCH 07/10] elinks: 0.14.1 -> 0.14.2 --- pkgs/applications/networking/browsers/elinks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index df9fc3f822cd..50ada47a4446 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -13,13 +13,13 @@ assert enablePython -> python != null; stdenv.mkDerivation rec { pname = "elinks"; - version = "0.14.1"; + version = "0.14.2"; src = fetchFromGitHub { owner = "rkd77"; repo = "felinks"; rev = "v${version}"; - sha256 = "sha256-D7dUVHgYGzY4FXEnOzXw0Fao3gLgfFuCl8LJdLVpcSM="; + sha256 = "sha256-/VsxMpITBDKJqyMwl1oitS8aUM4AziibV/OHRSHbRjg="; }; buildInputs = [ From cdbc8c9fb1aeb198e20a63782c0e8b40155afce8 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 30 Aug 2021 20:37:22 +0200 Subject: [PATCH 08/10] =?UTF-8?q?ocamlPackages.parsexp:=200.14.0=20?= =?UTF-8?q?=E2=86=92=200.14.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/janestreet/0.14.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/janestreet/0.14.nix b/pkgs/development/ocaml-modules/janestreet/0.14.nix index 5717dd07b423..23f2cb5cd651 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.14.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.14.nix @@ -351,7 +351,8 @@ with self; parsexp = janePackage { pname = "parsexp"; - hash = "0rvbrf8ggh2imsbhqi15jzyyqbi3m5hzvy2iy2r4skx6m102mzpd"; + version = "0.14.1"; + hash = "1nr0ncb8l2mkk8pqzknr7fsqw5kpz8y102kyv5bc0x7c36v0d4zy"; minimumOCamlVersion = "4.04.2"; meta.description = "S-expression parsing library"; propagatedBuildInputs = [ base sexplib0 ]; From 588b8cec0e57901007ea37fe00e5258988b2a57b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 6 Sep 2021 08:45:20 +0200 Subject: [PATCH 09/10] python3Packages.async-upnp-client: 0.20.0 -> 0.21.0 --- pkgs/development/python-modules/async-upnp-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/async-upnp-client/default.nix b/pkgs/development/python-modules/async-upnp-client/default.nix index 04e21ac9a68e..7f235485b757 100644 --- a/pkgs/development/python-modules/async-upnp-client/default.nix +++ b/pkgs/development/python-modules/async-upnp-client/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "async-upnp-client"; - version = "0.20.0"; + version = "0.21.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "StevenLooman"; repo = "async_upnp_client"; rev = version; - sha256 = "sha256-jxYGOljV7tcsiAgpOhbXj7g7AwyP1kDDC83PiHG6ZFg="; + sha256 = "sha256-GKvljxm2N4pC8Mh+UOW170VPB3va9X9BuQXp6OJ/SSQ="; }; propagatedBuildInputs = [ From 4f4ab52f4fde7d831e3dad4cd91f1da30a3d0ae8 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Fri, 18 Jun 2021 00:10:40 +0200 Subject: [PATCH 10/10] freeimage: support cross-compilation Co-authored-by: Doron Behar --- pkgs/development/libraries/freeimage/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/freeimage/default.nix b/pkgs/development/libraries/freeimage/default.nix index 236305a572bf..87997cead43f 100644 --- a/pkgs/development/libraries/freeimage/default.nix +++ b/pkgs/development/libraries/freeimage/default.nix @@ -18,6 +18,14 @@ stdenv.mkDerivation { prePatch = "rm -rf Source/Lib* Source/OpenEXR Source/ZLib"; patches = [ ./unbundle.diff ]; + postPatch = '' + # To support cross compilation, use the correct `pkg-config`. + substituteInPlace Makefile.fip \ + --replace "pkg-config" "$PKG_CONFIG" + substituteInPlace Makefile.gnu \ + --replace "pkg-config" "$PKG_CONFIG" + ''; + nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [