From 389d129a3dae25fb1cc868973c5cb25d33ddf9c9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Apr 2022 13:56:55 +0000 Subject: [PATCH 1/6] vit: 2.1.0 -> 2.2.0 --- pkgs/applications/misc/vit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/vit/default.nix b/pkgs/applications/misc/vit/default.nix index d5c454a06e85..2233faeb0561 100644 --- a/pkgs/applications/misc/vit/default.nix +++ b/pkgs/applications/misc/vit/default.nix @@ -8,12 +8,12 @@ with python3Packages; buildPythonApplication rec { pname = "vit"; - version = "2.1.0"; + version = "2.2.0"; disabled = lib.versionOlder python.version "3.6"; src = fetchPypi { inherit pname version; - sha256 = "fd34f0b827953dfdecdc39f8416d41c50c24576c33a512a047a71c1263eb3e0f"; + sha256 = "sha256-6GbIc5giuecxUqswyaAJw675R1M8BvelyyRNFcTqKW8="; }; propagatedBuildInputs = [ From bb0fbcc792db4bd001d7caeea43f650aae340a00 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 18 Apr 2022 09:14:52 -0500 Subject: [PATCH 2/6] vit: needs py3.7 now, drop pytz/tzlocal See: https://github.com/vit-project/vit/releases/tag/v2.2.0 --- pkgs/applications/misc/vit/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/applications/misc/vit/default.nix b/pkgs/applications/misc/vit/default.nix index 2233faeb0561..890a69f3b161 100644 --- a/pkgs/applications/misc/vit/default.nix +++ b/pkgs/applications/misc/vit/default.nix @@ -9,7 +9,7 @@ with python3Packages; buildPythonApplication rec { pname = "vit"; version = "2.2.0"; - disabled = lib.versionOlder python.version "3.6"; + disabled = lib.versionOlder python.version "3.7"; src = fetchPypi { inherit pname version; @@ -17,9 +17,7 @@ buildPythonApplication rec { }; propagatedBuildInputs = [ - pytz tasklib - tzlocal urwid ]; From 1f399bac821f11dda374c86ccded9d199bab9f01 Mon Sep 17 00:00:00 2001 From: s1341 Date: Thu, 14 Apr 2022 07:28:12 +0300 Subject: [PATCH 3/6] bionic_prebuilt: add x86_64 support --- .../linux/bionic-prebuilt/default.nix | 52 +++++++++++++------ 1 file changed, 37 insertions(+), 15 deletions(-) diff --git a/pkgs/os-specific/linux/bionic-prebuilt/default.nix b/pkgs/os-specific/linux/bionic-prebuilt/default.nix index 8fa17036c4ad..fc8b7d68bbc0 100644 --- a/pkgs/os-specific/linux/bionic-prebuilt/default.nix +++ b/pkgs/os-specific/linux/bionic-prebuilt/default.nix @@ -4,23 +4,44 @@ }: let - prebuilt_crt = fetchzip { - url = "https://android.googlesource.com/platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/+archive/98dce673ad97a9640c5d90bbb1c718e75c21e071/lib/gcc/aarch64-linux-android/4.9.x.tar.gz"; - sha256 = "sha256-LLD2OJi78sNN5NulOsJZl7Ei4F1EUYItGG6eUsKWULc="; - stripRoot = false; - }; + prebuilt_crt = { + aarch64 = fetchzip { + url = "https://android.googlesource.com/platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/+archive/98dce673ad97a9640c5d90bbb1c718e75c21e071/lib/gcc/aarch64-linux-android/4.9.x.tar.gz"; + sha256 = "sha256-LLD2OJi78sNN5NulOsJZl7Ei4F1EUYItGG6eUsKWULc="; + stripRoot = false; + }; + x86_64 = fetchzip { + url = "https://android.googlesource.com/platform/prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/+archive/7e8507d2a2d4df3bced561b894576de70f065be4/lib/gcc/x86_64-linux-android/4.9.x.tar.gz"; + sha256 = "sha256-y7CFLF76pTlj+oYev9taBnL2nlT3+Tx8c6wmicWmKEw="; + stripRoot = false; + }; + }.${stdenv.targetPlatform.parsed.cpu.name}; - prebuilt_libs = fetchzip { - url = "https://android.googlesource.com/platform/prebuilts/ndk/+archive/f2c77d8ba8a7f5c2d91771e31164f29be0b8ff98/platform/platforms/android-30/arch-arm64/usr/lib.tar.gz"; - sha256 = "sha256-TZBV7+D1QvKOCEi+VNGT5SStkgj0xRbyWoLH65zSrjw="; - stripRoot = false; - }; + prebuilt_libs = { + aarch64 = fetchzip { + url = "https://android.googlesource.com/platform/prebuilts/ndk/+archive/f2c77d8ba8a7f5c2d91771e31164f29be0b8ff98/platform/platforms/android-30/arch-arm64/usr/lib.tar.gz"; + sha256 = "sha256-TZBV7+D1QvKOCEi+VNGT5SStkgj0xRbyWoLH65zSrjw="; + stripRoot = false; + }; + x86_64 = fetchzip { + url = "https://android.googlesource.com/platform/prebuilts/ndk/+archive/f2c77d8ba8a7f5c2d91771e31164f29be0b8ff98/platform/platforms/android-30/arch-x86_64/usr/lib64.tar.gz"; + sha256 = "sha256-n2EuOKy3RGKmEYofNlm+vDDBuiQRuAJEJT6wq6NEJQs="; + stripRoot = false; + }; + }.${stdenv.targetPlatform.parsed.cpu.name}; - prebuilt_ndk_crt = fetchzip { - url = "https://android.googlesource.com/toolchain/prebuilts/ndk/r23/+archive/6c5fa4c0d3999b9ee932f6acbd430eb2f31f3151/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/30.tar.gz"; - sha256 = "sha256-KHw+cCwAwlm+5Nwp1o8WONqdi4BBDhFaVVr+7GxQ5uE="; - stripRoot = false; - }; + prebuilt_ndk_crt = { + aarch64 = fetchzip { + url = "https://android.googlesource.com/toolchain/prebuilts/ndk/r23/+archive/6c5fa4c0d3999b9ee932f6acbd430eb2f31f3151/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/30.tar.gz"; + sha256 = "sha256-KHw+cCwAwlm+5Nwp1o8WONqdi4BBDhFaVVr+7GxQ5uE="; + stripRoot = false; + }; + x86_64 = fetchzip { + url = "https://android.googlesource.com/toolchain/prebuilts/ndk/r23/+archive/6c5fa4c0d3999b9ee932f6acbd430eb2f31f3151/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/x86_64-linux-android/30.tar.gz"; + sha256 = "sha256-XEd7L3cBzn+1pKfji40V92G/uZhHSMMuZcRZaiKkLnk="; + stripRoot = false; + }; + }.${stdenv.targetPlatform.parsed.cpu.name}; ndk_support_headers = fetchzip { url ="https://android.googlesource.com/platform/prebuilts/clang/host/linux-x86/+archive/0e7f808fa26cce046f444c9616d9167dafbfb272/clang-r416183b/include/c++/v1/support.tar.gz"; @@ -41,6 +62,7 @@ in stdenvNoCC.mkDerivation rec { pname = "bionic-prebuilt"; version = "ndk-release-r23"; + name = "${stdenv.targetPlatform.parsed.cpu.name}-${pname}-${version}"; src = fetchzip { url = "https://android.googlesource.com/platform/bionic/+archive/00e8ce1142d8823b0d2fc8a98b40119b0f1f02cd.tar.gz"; From 8ebd3c038979180ad64389bc1b94a7dea6186e25 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 26 Apr 2022 17:53:32 +0300 Subject: [PATCH 4/6] squashfsTools: enable strictDeps --- pkgs/tools/filesystems/squashfs/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix index 340c5add295e..914d4aa33c2c 100644 --- a/pkgs/tools/filesystems/squashfs/default.nix +++ b/pkgs/tools/filesystems/squashfs/default.nix @@ -29,7 +29,9 @@ stdenv.mkDerivation rec { ./4k-align.patch ] ++ lib.optional stdenv.isDarwin ./darwin.patch; - buildInputs = [ zlib xz zstd lz4 lzo which help2man ]; + strictDeps = true; + nativeBuildInputs = [ help2man which ]; + buildInputs = [ zlib xz zstd lz4 lzo ]; preBuild = '' cd squashfs-tools From 7ed2f7d1ba20604621271c229ff499c05621e7b8 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 26 Apr 2022 17:55:29 +0300 Subject: [PATCH 5/6] squashfsTools: pull patch to make manpages reproducible adds -n to gzip --- pkgs/tools/filesystems/squashfs/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix index 914d4aa33c2c..0b2d6ae9cd65 100644 --- a/pkgs/tools/filesystems/squashfs/default.nix +++ b/pkgs/tools/filesystems/squashfs/default.nix @@ -24,6 +24,11 @@ stdenv.mkDerivation rec { }; patches = [ + # remove once https://github.com/plougher/squashfs-tools/pull/177 is merged and in a release + (fetchpatch { + url = "https://github.com/plougher/squashfs-tools/commit/6100e82c7e7f18f503c003c67c87791025d5f01b.patch"; + sha256 = "sha256-bMBQsbSKQ4E7r9avns2QaomGAYl3s82m58gYyTQdB08="; + }) # This patch adds an option to pad filesystems (increasing size) in # exchange for better chunking / binary diff calculation. ./4k-align.patch From 4f653a68d8b676931fabeab4b8eec2dcb9c1e5af Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 26 Apr 2022 20:42:33 +0300 Subject: [PATCH 6/6] squafsTools: fix cross --- pkgs/tools/filesystems/squashfs/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix index 0b2d6ae9cd65..3be3865ccd07 100644 --- a/pkgs/tools/filesystems/squashfs/default.nix +++ b/pkgs/tools/filesystems/squashfs/default.nix @@ -35,7 +35,9 @@ stdenv.mkDerivation rec { ] ++ lib.optional stdenv.isDarwin ./darwin.patch; strictDeps = true; - nativeBuildInputs = [ help2man which ]; + nativeBuildInputs = [ which ] + # when cross-compiling help2man cannot run the cross-compiled binary + ++ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ help2man ]; buildInputs = [ zlib xz zstd lz4 lzo ]; preBuild = ''