From 81bb75b6efb9ed4001ca4ed36da043b4fe264c3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 24 May 2022 16:13:24 +0200 Subject: [PATCH 01/23] e2fsprogs: apply patch unconditionally Commit 49d0a5afd mistakenly inverted when to apply the patch. Maybe it's not needed anymore, as pkgsMusl.e2fsprogs succeeded for me even without it, but it looks harmless and better not have it inversed. This way we also don't cause a mass rebuild :-) (cherry picked from commit f0089877040aa2d97814b9a3f261737115769dd4) --- pkgs/tools/filesystems/e2fsprogs/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index 7273d805a320..0958bb2955b1 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -22,15 +22,13 @@ stdenv.mkDerivation rec { buildInputs = [ libuuid gettext ] ++ lib.optionals stdenv.isLinux [ fuse ]; - # Only use glibc's __GNUC_PREREQ(X,Y) (checks if compiler is gcc version >= X.Y) when using glibc patches = [ (fetchpatch { name = "CVE-2022-1304.patch"; url = "https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/patch/?id=ab51d587bb9b229b1fade1afd02e1574c1ba5c76"; sha256 = "sha256-YEEow34/81NBOc6F6FS6i505FCQ7GHeIz0a0qWNs7Fg="; }) - ] ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ - (fetchpatch { + (fetchpatch { # avoid using missing __GNUC_PREREQ(X,Y) url = "https://raw.githubusercontent.com/void-linux/void-packages/9583597eb3e6e6b33f61dbc615d511ce030bc443/srcpkgs/e2fsprogs/patches/fix-glibcism.patch"; sha256 = "1gfcsr0i3q8q2f0lqza8na0iy4l4p3cbii51ds6zmj0y4hz2dwhb"; excludes = [ "lib/ext2fs/hashmap.h" ]; From 6e466b727d52d80086abb28b1b996eb8595317af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Thu, 26 May 2022 15:45:38 +0200 Subject: [PATCH 02/23] release: Slightly adjust release-critical packages Removing Python 2 because it's EOL and most packages don't use it anymore. Also replace thunderbird with firefox because more people use it and it feels better maintained in general (cherry picked from commit 24bd72fd836b1a9475ca3931d3c04b884082d437) --- pkgs/top-level/release.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 0c759095f56d..bac3d1b1171d 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -57,7 +57,6 @@ let jobs.openssl.x86_64-darwin jobs.pandoc.x86_64-darwin jobs.postgresql.x86_64-darwin - jobs.python2.x86_64-darwin jobs.python3.x86_64-darwin jobs.ruby.x86_64-darwin jobs.rustc.x86_64-darwin @@ -102,7 +101,6 @@ let jobs.go.x86_64-linux jobs.linux.x86_64-linux jobs.pandoc.x86_64-linux - jobs.python2.x86_64-linux jobs.python3.x86_64-linux # Needed by contributors to test PRs (by inclusion of the PR template) jobs.nixpkgs-review.x86_64-linux @@ -110,7 +108,7 @@ let jobs.nix-info.x86_64-linux jobs.nix-info-tested.x86_64-linux # Ensure that X11/GTK are in order. - jobs.thunderbird-unwrapped.x86_64-linux + jobs.firefox-unwrapped.x86_64-linux jobs.cachix.x86_64-linux /* @@ -138,7 +136,6 @@ let jobs.cargo.x86_64-darwin jobs.cachix.x86_64-darwin jobs.go.x86_64-darwin - jobs.python2.x86_64-darwin jobs.python3.x86_64-darwin jobs.nixpkgs-review.x86_64-darwin jobs.nix-info.x86_64-darwin From c3aa32bed05cb2161d9a8800ac1d21ab746e0041 Mon Sep 17 00:00:00 2001 From: Matthew Toohey Date: Wed, 25 May 2022 20:25:12 -0400 Subject: [PATCH 03/23] nixos/version: add trailing newline to os-release (cherry picked from commit e41c423b01bb803c5745b8b296b2d898a3e5f798) --- nixos/modules/misc/version.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index 575df74452bd..32d631384c5a 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -13,7 +13,7 @@ let attrsToText = attrs: concatStringsSep "\n" ( mapAttrsToList (n: v: ''${n}=${escapeIfNeccessary (toString v)}'') attrs - ); + ) + "\n"; osReleaseContents = { NAME = "NixOS"; From 75a28d908bc02f6cd180d7eb628dde052bc690af Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Sat, 21 May 2022 19:10:40 -0700 Subject: [PATCH 04/23] vkdisplayinfo: init at 0.1 https://github.com/ChristophHaag/vkdisplayinfo Apply suggestions from @SuperSandro2000's code review Co-authored-by: Sandro Don't use pipefail (cherry picked from commit 108dea5cdacd5f8fb221f051c06f7078aa8a3b49) --- pkgs/tools/graphics/vkdisplayinfo/default.nix | 48 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/tools/graphics/vkdisplayinfo/default.nix diff --git a/pkgs/tools/graphics/vkdisplayinfo/default.nix b/pkgs/tools/graphics/vkdisplayinfo/default.nix new file mode 100644 index 000000000000..a48c4d1154fe --- /dev/null +++ b/pkgs/tools/graphics/vkdisplayinfo/default.nix @@ -0,0 +1,48 @@ +{ lib +, stdenv +, meson +, ninja +, vulkan-loader +, vulkan-headers +, fetchFromGitHub +}: +stdenv.mkDerivation rec { + pname = "vkdisplayinfo"; + version = "0.1"; + + src = fetchFromGitHub { + owner = "ChristophHaag"; + repo = "vkdisplayinfo"; + rev = version; + hash = "sha256-n6U7T5aOYTpgWE2WGPBPHtQKzitf9PxAoXJNWyz4rYw="; + }; + + postInstall = '' + install vkdisplayinfo -Dm755 -t $out/bin + ''; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + ($out/bin/vkdisplayinfo 2>&1 || true) | grep -q vkdisplayinfo + runHook postInstallCheck + ''; + + nativeBuildInputs = [ + meson + ninja + ]; + + buildInputs = [ + vulkan-loader + vulkan-headers + ]; + + meta = with lib; { + description = "Print displays and modes enumerated with the Vulkan function vkGetPhysicalDeviceDisplayPropertiesKHR"; + homepage = "https://github.com/ChristophHaag/vkdisplayinfo"; + platforms = platforms.linux; + license = licenses.boost; + maintainers = [ maintainers.LunNova ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5668f65fab1f..53a0d69aab2d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20955,6 +20955,8 @@ with pkgs; hdf5 = hdf5.override { usev110Api = true; }; }; + vkdisplayinfo = callPackage ../tools/graphics/vkdisplayinfo { }; + vlock = callPackage ../misc/screensavers/vlock { }; vmime = callPackage ../development/libraries/vmime { }; From fa71687b279eb5d77349e61a04553c205d2b248a Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Thu, 26 May 2022 22:15:38 +0200 Subject: [PATCH 05/23] openmoji-black,openmoji-color: fix hanging builds ...by downgrading fontforge. Fixes https://github.com/NixOS/nixpkgs/issues/167869 (cherry picked from commit 6ee6794c8ca4e44d483a0b4d361ff0236202d737) --- pkgs/data/fonts/openmoji/default.nix | 33 +++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/pkgs/data/fonts/openmoji/default.nix b/pkgs/data/fonts/openmoji/default.nix index d511a78f7250..baf49c80e1c7 100644 --- a/pkgs/data/fonts/openmoji/default.nix +++ b/pkgs/data/fonts/openmoji/default.nix @@ -1,7 +1,10 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , scfbuild +, fontforge +, libuninameslist , nodejs , nodePackages , python3Packages @@ -14,6 +17,34 @@ let [ "OpenMoji-Color.ttf" "OpenMoji-Black.ttf" ] variant; + # With newer fontforge the build hangs, see + # https://github.com/NixOS/nixpkgs/issues/167869 + # Patches etc taken from + # https://github.com/NixOS/nixpkgs/commit/69da642a5a9bb433138ba1b13c8d56fb5bb6ec05 + fontforge-20201107 = fontforge.overrideAttrs (old: rec { + version = "20201107"; + src = fetchFromGitHub { + owner = "fontforge"; + repo = "fontforge"; + rev = version; + sha256 = "sha256-Rl/5lbXaPgIndANaD0IakaDus6T53FjiBb45FIuGrvc="; + }; + patches = [ + (fetchpatch { + url = "https://salsa.debian.org/fonts-team/fontforge/raw/76bffe6ccf8ab20a0c81476a80a87ad245e2fd1c/debian/patches/0001-add-extra-cmake-install-rules.patch"; + sha256 = "u3D9od2xLECNEHhZ+8dkuv9818tPkdP6y/Tvd9CADJg="; + }) + (fetchpatch { + url = "https://github.com/fontforge/fontforge/commit/69e263b2aff29ad22f97f13935cfa97a1eabf207.patch"; + sha256 = "06yyf90605aq6ppfiz83mqkdmnaq5418axp9jgsjyjq78b00xb29"; + }) + ]; + buildInputs = old.buildInputs ++ [ libuninameslist ]; + }); + scfbuild-with-fontforge-20201107 = scfbuild.override (old: { + fontforge = fontforge-20201107; + }); + in stdenv.mkDerivation rec { pname = "openmoji"; version = "13.1.0"; @@ -26,7 +57,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ - scfbuild + scfbuild-with-fontforge-20201107 nodejs nodePackages.glob nodePackages.lodash From 47e85c3a34239a3f3c0e15fe044bc38c5ce25c66 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Wed, 18 May 2022 14:59:39 +0000 Subject: [PATCH 06/23] mysql: 8.0.28 -> 8.0.29 (cherry picked from commit 0ce4fec78597d266f0d56fbc02586d8f694d0fc3) --- pkgs/servers/sql/mysql/8.0.x.nix | 6 ++---- pkgs/top-level/all-packages.nix | 6 +++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/sql/mysql/8.0.x.nix b/pkgs/servers/sql/mysql/8.0.x.nix index f897e018d693..f7611d253e5b 100644 --- a/pkgs/servers/sql/mysql/8.0.x.nix +++ b/pkgs/servers/sql/mysql/8.0.x.nix @@ -6,11 +6,11 @@ let self = stdenv.mkDerivation rec { pname = "mysql"; - version = "8.0.28"; + version = "8.0.29"; src = fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-${self.mysqlVersion}/${pname}-${version}.tar.gz"; - sha256 = "sha256-2Gk2nrbeTyuy2407Mbe3OWjjVuX/xDVPS5ZlirHkiyI="; + sha256 = "sha256-USFw+m94ppTW8Y0ZfpmdJxbuaNxUHXZE3ZIqNmNAcmY="; }; nativeBuildInputs = [ bison cmake pkg-config ] @@ -20,8 +20,6 @@ self = stdenv.mkDerivation rec { postPatch = '' substituteInPlace cmake/libutils.cmake --replace /usr/bin/libtool libtool substituteInPlace cmake/os/Darwin.cmake --replace /usr/bin/libtool libtool - substituteInPlace cmake/fido2.cmake \ - --replace ''$\{MY_PKG_CONFIG_EXECUTABLE\} "${pkg-config}/bin/pkg-config" ''; buildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0db76ad4c493..35d4419217db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22233,9 +22233,9 @@ with pkgs; mysql80 = callPackage ../servers/sql/mysql/8.0.x.nix { inherit (darwin) cctools developer_cmds DarwinTools; inherit (darwin.apple_sdk.frameworks) CoreServices; - boost = boost173; # Configure checks for specific version. - protobuf = protobuf3_11; - icu = icu67; + boost = boost177; # Configure checks for specific version. + protobuf = protobuf3_19; + icu = icu69; }; mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { }; From a87c409c9d06abd3d588dac2ad2399456bcc8baf Mon Sep 17 00:00:00 2001 From: Yaya Date: Sat, 28 May 2022 11:18:33 +0000 Subject: [PATCH 07/23] snowflake: 2.0.1 -> 2.2.0 (cherry picked from commit 45109ffcb8c2ef1998129cd52bd9685f0763b11d) --- pkgs/tools/networking/snowflake/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/snowflake/default.nix b/pkgs/tools/networking/snowflake/default.nix index 8535f18567da..fb343fac5a57 100644 --- a/pkgs/tools/networking/snowflake/default.nix +++ b/pkgs/tools/networking/snowflake/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "snowflake"; - version = "2.0.1"; + version = "2.2.0"; src = fetchgit { url = "https://git.torproject.org/pluggable-transports/${pname}"; rev = "v${version}"; - hash = "sha256-ULkqsh0DeFI1GsaVaHGSjoEY38EktvDVC52Sx6cQLOE="; + sha256 = "0iazamrfixv6yxc5m49adm97biq93pn6hwwpbh8yq558hrc6bh70"; }; - vendorSha256 = "D5A19UHL1WEE1ODT80jKT+PJ5CTXPjc9Eg6v2Nfm4aw="; + vendorSha256 = "1v7cpg3kny0vqmdbgcc7i61wi5gx5wvrv0hmjykjrqgrvyq764c1"; meta = with lib; { description = "System to defeat internet censorship"; From 6daced223a80bea79e248c00b08bfa0355ce0a39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 28 May 2022 22:08:29 +0000 Subject: [PATCH 08/23] python310Packages.miniaudio: fix build on Darwin (cherry picked from commit 57436c50ee9f1cb4bb9b6b18220d83f2dd5e4e75) --- pkgs/development/python-modules/miniaudio/default.nix | 8 ++++++++ pkgs/top-level/python-packages.nix | 4 +++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/miniaudio/default.nix b/pkgs/development/python-modules/miniaudio/default.nix index f0e5db4f0ecd..e18396accfcc 100644 --- a/pkgs/development/python-modules/miniaudio/default.nix +++ b/pkgs/development/python-modules/miniaudio/default.nix @@ -1,9 +1,12 @@ { lib +, stdenv , buildPythonPackage , pythonOlder , fetchFromGitHub , cffi , pytestCheckHook +, AudioToolbox +, CoreAudio }: buildPythonPackage rec { @@ -19,6 +22,11 @@ buildPythonPackage rec { sha256 = "16llwmbbd9445rwhl4v66kf5zd7yl3a94zm9xyllq6ij7vnhg5jb"; }; + buildInputs = lib.optionals stdenv.isDarwin [ + AudioToolbox + CoreAudio + ]; + propagatedNativeBuildInputs = [ cffi ]; propagatedBuildInputs = [ cffi ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ae17e8003162..85c945606a6b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5294,7 +5294,9 @@ in { minexr = callPackage ../development/python-modules/minexr { }; - miniaudio = callPackage ../development/python-modules/miniaudio { }; + miniaudio = callPackage ../development/python-modules/miniaudio { + inherit (pkgs.darwin.apple_sdk.frameworks) AudioToolbox CoreAudio; + }; minidb = callPackage ../development/python-modules/minidb { }; From 361309a6949d82af01ac9f112d8240bdae984d41 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 May 2022 03:35:27 +0000 Subject: [PATCH 09/23] gnome.eog: 42.1 -> 42.2 (cherry picked from commit 213cac429ffc20729ac1e47cb5ba0baf701e4160) --- pkgs/desktops/gnome/core/eog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/eog/default.nix b/pkgs/desktops/gnome/core/eog/default.nix index 5a2c410c2c06..b15c8e557cd1 100644 --- a/pkgs/desktops/gnome/core/eog/default.nix +++ b/pkgs/desktops/gnome/core/eog/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "eog"; - version = "42.1"; + version = "42.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-/LEtXbyFYY3xSzDmMB5eHO+Dgq4nItL1WmQ1Adx8n60="; + sha256 = "sha256-Dk1Kai7hokCui1hEnwK6LGS3+ZSQ0LiRXX9SyQpYBF4="; }; patches = [ From fb9306521f53e47c4f9284ebac33e6f1d613eb8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 28 May 2022 22:23:56 +0000 Subject: [PATCH 10/23] python310Packages.pikepdf: fix build on aarch64-darwin (cherry picked from commit f0eb6d2059d307ff1a8fa2758b23bf2cdcde9897) --- pkgs/development/python-modules/pikepdf/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index aa5a66826cbe..b3d34d823361 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -51,6 +51,10 @@ buildPythonPackage rec { }) ]; + postPatch = '' + sed -i 's|\S*/opt/homebrew.*|pass|' setup.py + ''; + SETUPTOOLS_SCM_PRETEND_VERSION = version; buildInputs = [ From ca7b59239567cdd03e538f9029b1314179e9bda5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 28 May 2022 23:57:50 +0000 Subject: [PATCH 11/23] python310Packages.ocrmypdf: fix build on Darwin With enabled sandbox we get PermissionError: [Errno 1] Operation not permitted when calling os.nice(). (cherry picked from commit 65450988a59dc253a93148e6d9cd739a0e9e2083) --- pkgs/development/python-modules/ocrmypdf/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix index e411519c95a4..3576842139ee 100644 --- a/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/pkgs/development/python-modules/ocrmypdf/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , coloredlogs , fetchFromGitHub +, fetchpatch , ghostscript , img2pdf , importlib-metadata @@ -53,6 +54,11 @@ buildPythonPackage rec { tesseract = "${lib.getBin tesseract4}/bin/tesseract"; unpaper = "${lib.getBin unpaper}/bin/unpaper"; }) + # https://github.com/ocrmypdf/OCRmyPDF/pull/973 + (fetchpatch { + url = "https://github.com/ocrmypdf/OCRmyPDF/commit/808b24d59f5b541a335006aa6ea7cdc3c991adc0.patch"; + hash = "sha256-khsH70fWk5fStf94wcRKKX7cCbgD69LtKkngJIqA3+w="; + }) ]; nativeBuildInputs = [ From cd7af3091d72de24bc1b15bf6c26ed76b935f187 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 May 2022 03:46:59 +0000 Subject: [PATCH 12/23] gnome.gnome-maps: 42.1 -> 42.2 (cherry picked from commit d64d4c8fcc585abe3dc159a4d7091c0cc6cd5f10) --- pkgs/desktops/gnome/apps/gnome-maps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-maps/default.nix b/pkgs/desktops/gnome/apps/gnome-maps/default.nix index a0d566c7ef9e..3ed33be4e98a 100644 --- a/pkgs/desktops/gnome/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-maps/default.nix @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { pname = "gnome-maps"; - version = "42.1"; + version = "42.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-CC+ElBAf080xvU8a6YgXEOMqUz+y3belcSJ5bJRm0q4="; + sha256 = "sha256-Xm0bDKfMk56pGq39pWM6hl6oX6VlADaGGyv+8L/QabE="; }; doCheck = true; From d42735f21bb12090192fd40566089a75d588cec7 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 26 May 2022 19:37:45 +0300 Subject: [PATCH 13/23] u-boot: embiggen RPi kernel allocation again, again (cherry picked from commit ff391e0f0d2a12bc8ee80b5d683cefe4b5f54736) --- ...0001-configs-rpi-allow-for-bigger-kernels.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/misc/uboot/0001-configs-rpi-allow-for-bigger-kernels.patch b/pkgs/misc/uboot/0001-configs-rpi-allow-for-bigger-kernels.patch index 2dbf11bdf2e3..3a6fbeaef411 100644 --- a/pkgs/misc/uboot/0001-configs-rpi-allow-for-bigger-kernels.patch +++ b/pkgs/misc/uboot/0001-configs-rpi-allow-for-bigger-kernels.patch @@ -17,12 +17,12 @@ index 834f1cd..10ab1e7 100644 * parameter given to the kernel. So reserving memory from low to high - * satisfies this constraint again. Reserving 1M at 0x02600000-0x02700000 for - * the DTB leaves rest of the free RAM to the initrd starting at 0x02700000. -+ * satisfies this constraint again. Reserving 1M at 0x03700000-0x03800000 for -+ * the DTB leaves rest of the free RAM to the initrd starting at 0x03800000. ++ * satisfies this constraint again. Reserving 1M at 0x04700000-0x04800000 for ++ * the DTB leaves rest of the free RAM to the initrd starting at 0x04800000. * Even with the smallest possible CPU-GPU memory split of the CPU getting - * only 64M, the remaining 25M starting at 0x02700000 should allow quite - * large initrds before they start colliding with U-Boot. -+ * only 64M, the remaining 9M starting at 0x03800000 should allow reasonably ++ * only 64M, the remaining 8M starting at 0x04800000 should allow reasonably + * sized initrds before they start colliding with U-Boot. */ #define ENV_MEM_LAYOUT_SETTINGS \ @@ -33,10 +33,10 @@ index 834f1cd..10ab1e7 100644 - "pxefile_addr_r=0x02500000\0" \ - "fdt_addr_r=0x02600000\0" \ - "ramdisk_addr_r=0x02700000\0" -+ "scriptaddr=0x03500000\0" \ -+ "pxefile_addr_r=0x03600000\0" \ -+ "fdt_addr_r=0x03700000\0" \ -+ "ramdisk_addr_r=0x03800000\0" ++ "scriptaddr=0x04500000\0" \ ++ "pxefile_addr_r=0x04600000\0" \ ++ "fdt_addr_r=0x04700000\0" \ ++ "ramdisk_addr_r=0x04800000\0" #if CONFIG_IS_ENABLED(CMD_MMC) #define BOOT_TARGET_MMC(func) \ From 49d24ce4d835e2c45f091d8da7f81a65b98f7f19 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 May 2022 03:29:11 +0000 Subject: [PATCH 14/23] gnome.aisleriot: 3.22.22 -> 3.22.23 (cherry picked from commit 9344541ff215ee2929767196fb639b0f93d6ad63) --- pkgs/desktops/gnome/games/aisleriot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/games/aisleriot/default.nix b/pkgs/desktops/gnome/games/aisleriot/default.nix index 953a40623c0d..9876ee652604 100644 --- a/pkgs/desktops/gnome/games/aisleriot/default.nix +++ b/pkgs/desktops/gnome/games/aisleriot/default.nix @@ -19,14 +19,14 @@ stdenv.mkDerivation rec { pname = "aisleriot"; - version = "3.22.22"; + version = "3.22.23"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = pname; rev = version; - sha256 = "sha256-Jr4XEj6h+gI1gNqoJ/cJ3cDBB4mSbpzvOUQkwGxkLPs="; + sha256 = "sha256-s7z1bR2ZG3YxJcqNrhH+O5PfGeFoPWeWSI26VCCe33Y="; }; nativeBuildInputs = [ From 623b1681a60c888cc69cc0b30d79ffe4e2db13f3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 May 2022 04:12:29 +0000 Subject: [PATCH 15/23] gnome.gnome-terminal: 3.44.0 -> 3.44.1 (cherry picked from commit 87fd72101b19775a91228e0c94c31939546d5bd2) --- pkgs/desktops/gnome/core/gnome-terminal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-terminal/default.nix b/pkgs/desktops/gnome/core/gnome-terminal/default.nix index 85918f0e31c0..a8ca028b5558 100644 --- a/pkgs/desktops/gnome/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome/core/gnome-terminal/default.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { pname = "gnome-terminal"; - version = "3.44.0"; + version = "3.44.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-terminal/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "qpZxie62CUWebApGigHqcMuMRTDaHVALLT9PxDi4/io="; + sha256 = "+28g7h/yMamq7asT1dxuWmTJVXESJISLeQCG6IlZ03s="; }; nativeBuildInputs = [ From 2e263afbd0ed96c470cdcfda3b8afe7814bb0b0f Mon Sep 17 00:00:00 2001 From: "Bryan A. S" Date: Sat, 28 May 2022 23:30:39 -0300 Subject: [PATCH 16/23] argocd-autopilot: 0.3.5 -> 0.3.7 - bump version - fix typo in ldflags to make sure default manifests url works (cherry picked from commit 063471168d60a9f5f5cf097d845fafc3bdd8404a) --- .../networking/cluster/argocd-autopilot/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/argocd-autopilot/default.nix b/pkgs/applications/networking/cluster/argocd-autopilot/default.nix index c56f937223c9..6ad61eb39691 100644 --- a/pkgs/applications/networking/cluster/argocd-autopilot/default.nix +++ b/pkgs/applications/networking/cluster/argocd-autopilot/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "argocd-autopilot"; - version = "0.3.5"; + version = "0.3.7"; src = fetchFromGitHub { owner = "argoproj-labs"; repo = "argocd-autopilot"; rev = "v${version}"; - sha256 = "sha256-YqnmtDVtprQQFbL++X9rUJFGj+fMD+fvDRWsQ+uOxxo="; + sha256 = "sha256-dLmJQCASdWkzWOPQ0bdJLe2AD06+L2ghP2yWry1XL1k="; }; - vendorSha256 = "sha256-r8RTwMzFS/BkxW08+wfAovuFLpIOReDsuHi/Hx9cVPc="; + vendorSha256 = "sha256-0v/HTiQf/mZUU1b55jAnSj86NEFOUaiM+/MrVvwJYBM="; proxyVendor = true; @@ -24,7 +24,7 @@ buildGoModule rec { "-X ${package_url}.version=${src.rev}" "-X ${package_url}.buildDate=unknown" "-X ${package_url}.gitCommit=${src.rev}" - "-X ${package_url}.installationManifestURL=github.com/argoproj-labs/argocd-autopilot/manifests/base?ref=${src.rev}" + "-X ${package_url}.installationManifestsURL=github.com/argoproj-labs/argocd-autopilot/manifests/base?ref=${src.rev}" "-X ${package_url}.installationManifestsNamespacedURL=github.com/argoproj-labs/argocd-autopilot/manifests/insecure?ref=${src.rev}" ]; From 0a553b0acea6e1e643bc459aafa5abd078701a18 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 May 2022 16:13:40 +0200 Subject: [PATCH 17/23] python39Packages.graspologic: mark as broken (cherry picked from commit 9102b1cc65c05edb0ada9b1391c942bb3862dfd4) --- pkgs/development/python-modules/graspologic/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/graspologic/default.nix b/pkgs/development/python-modules/graspologic/default.nix index 1a246461e5f7..f16ba5fc4c77 100644 --- a/pkgs/development/python-modules/graspologic/default.nix +++ b/pkgs/development/python-modules/graspologic/default.nix @@ -45,5 +45,7 @@ buildPythonPackage rec { description = "A package for graph statistical algorithms"; license = licenses.asl20; # changing to `licenses.mit` in next release maintainers = with maintainers; [ bcdarwin ]; + # graspologic-native is not available + broken = true; }; } From ee30f081ef242b023d010c9792415fd8f98f3421 Mon Sep 17 00:00:00 2001 From: AtilaSaraiva Date: Sun, 29 May 2022 11:19:12 -0300 Subject: [PATCH 18/23] distrobox: 1.2.15 -> 1.3.0 (cherry picked from commit 4330af7dd81e73cd9cbcf4578f979df4e336f87e) --- pkgs/applications/virtualization/distrobox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/distrobox/default.nix b/pkgs/applications/virtualization/distrobox/default.nix index e29de7a52fdd..d8b106c75764 100644 --- a/pkgs/applications/virtualization/distrobox/default.nix +++ b/pkgs/applications/virtualization/distrobox/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "distrobox"; - version = "1.2.15"; + version = "1.3.0"; src = fetchFromGitHub { owner = "89luca89"; repo = pname; rev = version; - sha256 = "sha256-9rivXnHyEE1MoGY+CwUeDStLGPVq+4FvwPjV7Nblk60="; + sha256 = "sha256-31SDi9B6Ug6lRDMgaMp6lwdSsmQ7ywEwjG1Ez/jXjBc="; }; dontConfigure = true; From 5d4a350660a91062564bbcff7fb7b8aa1b8cb1b0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 28 May 2022 11:35:21 +0200 Subject: [PATCH 19/23] nixos/doc/rl-2205: add slapd argon2 module rename hint (cherry picked from commit 173fdcb251270c2c84f4cca2ea15f61a0b6cc884) --- nixos/doc/manual/from_md/release-notes/rl-2205.section.xml | 7 +++++++ nixos/doc/manual/release-notes/rl-2205.section.md | 2 ++ 2 files changed, 9 insertions(+) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index b291d38da671..5f9af1ee151a 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -714,6 +714,13 @@ services.openldap.settings, which represents your cn=config. + + Additionally with 2.5 the argon2 module was included in the + standard distrubtion and renamed from + pw-argon2 to argon2. + Remember to update your olcModuleLoad entry + in cn=config. + diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 4f4643e505bc..7f9c3e35cc07 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -250,6 +250,8 @@ In addition to numerous new and upgraded packages, this release has the followin - `openldap` (and therefore the slapd LDAP server) were updated to version 2.6.2. The project introduced backwards-incompatible changes, namely the removal of the bdb, hdb, ndb, and shell backends in slapd. Therefore before updating, dump your database `slapcat -n 1` in LDIF format, and reimport it after updating your `services.openldap.settings`, which represents your `cn=config`. + Additionally with 2.5 the argon2 module was included in the standard distrubtion and renamed from `pw-argon2` to `argon2`. Remember to update your `olcModuleLoad` entry in `cn=config`. + - `openssh` has been update to 8.9p1, changing the FIDO security key middleware interface. - `git` no longer hardcodes the path to openssh' ssh binary to reduce the amount of rebuilds. If you are using git with ssh remotes and do not have a ssh binary in your enviroment consider adding `openssh` to it or switching to `gitFull`. From 66160e08c4ab3ecc2a11ce47c38f325df43c2272 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 23 May 2022 15:31:21 +0200 Subject: [PATCH 20/23] fcft: 3.1.1 -> 3.1.2 https://codeberg.org/dnkl/fcft/releases/tag/3.1.2 (cherry picked from commit ebfcc109b2bf1430881e063900e20e19460853b0) --- pkgs/development/libraries/fcft/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/fcft/default.nix b/pkgs/development/libraries/fcft/default.nix index f03c24e28cbf..9ed4df601d35 100644 --- a/pkgs/development/libraries/fcft/default.nix +++ b/pkgs/development/libraries/fcft/default.nix @@ -20,14 +20,14 @@ in stdenv.mkDerivation rec { pname = "fcft"; - version = "3.1.1"; + version = "3.1.2"; src = fetchFromGitea { domain = "codeberg.org"; owner = "dnkl"; repo = "fcft"; rev = version; - sha256 = "1b43sqp5hah374ns62pcrmbiriqsdisb60hp1nwqz3ny3rfjvn15"; + sha256 = "1m7prc792dsd4mg6iqqwbfbmvs3a2yw2zmj0cd3qrf7h672b8snq"; }; depsBuildBuild = [ pkg-config ]; From 10c86be5af389ec73b8010515fb5b99445235cad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 28 May 2022 17:23:02 +0200 Subject: [PATCH 21/23] genimage: 9 -> 15 It still doesn't install any documenation, the README now has .rst file extension. (cherry picked from commit 42b247f7e7eb9fcbd6830d7669da778e053c0d2e) --- pkgs/tools/filesystems/genimage/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/genimage/default.nix b/pkgs/tools/filesystems/genimage/default.nix index b3ca1ae8394b..e23bb0627006 100644 --- a/pkgs/tools/filesystems/genimage/default.nix +++ b/pkgs/tools/filesystems/genimage/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "genimage"; - version = "9"; + version = "15"; src = fetchurl { url = "https://public.pengutronix.de/software/genimage/genimage-${version}.tar.xz"; - sha256 = "0y4h8x8lqxam8m90rdfq8cg5137kvilxr3d1qzddpx7nxpvmmwv9"; + sha256 = "0gh05pkmqn9ck79mwvl2812ssh0fb0xbq72iwh7b641ki2zj9jlv"; }; nativeBuildInputs = [ pkg-config ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # documentation. docdir="$out/share/doc/genimage" mkdir -p "$docdir" - cp -v README "$docdir" + cp -v README.rst "$docdir" ''; meta = with lib; { From 7ac55c542a34a4709b962eaf1a6d3397112cbd14 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 29 May 2022 19:16:21 +0100 Subject: [PATCH 22/23] python3Packages.pomegranate: 0.13.5 -> 0.14.8 (cherry picked from commit 17003648fec3f0723844df68900b38670f835248) --- .../python-modules/pomegranate/default.nix | 20 ++++--------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/pomegranate/default.nix b/pkgs/development/python-modules/pomegranate/default.nix index cb87f352154c..02b0a340c9ee 100644 --- a/pkgs/development/python-modules/pomegranate/default.nix +++ b/pkgs/development/python-modules/pomegranate/default.nix @@ -15,28 +15,16 @@ buildPythonPackage rec { pname = "pomegranate"; - version = "0.13.5"; + version = "0.14.8"; src = fetchFromGitHub { repo = pname; owner = "jmschrei"; - rev = "v${version}"; - sha256 = "1hbxchp3daykkf1fa79a9mh34p78bygqcf1nv4qwkql3gw0pd6l7"; + # no tags for recent versions: https://github.com/jmschrei/pomegranate/issues/974 + rev = "0652e955c400bc56df5661db3298a06854c7cce8"; + sha256 = "16g49nl2bgnh6nh7bd21s393zbksdvgp9l13ww2diwhplj6hlly3"; }; - patches = lib.optionals (lib.versionOlder version "13.6") [ - # Fix compatibility with recent joblib release, will be part of the next - # pomegranate release after 0.13.5 - (fetchpatch { - url = "https://github.com/jmschrei/pomegranate/commit/42d14bebc44ffd4a778b2a6430aa845591b7c3b7.patch"; - sha256 = "0f9cx0fj9xkr3hch7jyrn76zjypilh5bqw734caaw6g2m49lvbff"; - }) - ] ++ [ - # Likely an upstream test bug and not a real problem: - # https://github.com/jmschrei/pomegranate/issues/939 - ./disable-failed-on-nextworkx-2.6.patch - ] ; - propagatedBuildInputs = [ numpy scipy cython networkx joblib pyyaml ]; checkInputs = [ pandas nose ]; # as of 0.13.5, it depends explicitly on nose, rather than pytest. From d20913a939d6ee799b857abaaba5337c949b087e Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 29 May 2022 21:39:06 +0100 Subject: [PATCH 23/23] python3Packages.cnvkit: 0.9.7 -> 0.9.9, skip broken test (cherry picked from commit 798d9f9f3bc5dcbcb75d2ebff35c2e0e580d61d1) --- .../python-modules/cnvkit/default.nix | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/cnvkit/default.nix b/pkgs/development/python-modules/cnvkit/default.nix index 6347c8552bf6..36e4bcf2760d 100644 --- a/pkgs/development/python-modules/cnvkit/default.nix +++ b/pkgs/development/python-modules/cnvkit/default.nix @@ -21,22 +21,23 @@ buildPythonPackage rec { pname = "CNVkit"; - version = "0.9.7"; + version = "0.9.9"; src = fetchFromGitHub { owner = "etal"; repo = "cnvkit"; rev = "v${version}"; - sha256 = "022zplgqil5l76vri647cyjx427vnbg5r2gw6lw712d2janvdjm7"; + sha256 = "1q4l7jhr1k135an3n9aa9wsid5lk6fwxb0hcldrr6v6y76zi4gj1"; }; - patches = [ - # Fix: AttributeError: module 'pandas.io.common' has no attribute 'EmptyDataError' - (fetchpatch { - url = "https://github.com/etal/cnvkit/commit/392adfffedfa0415e635b72c5027835b0a8d7ab5.patch"; - sha256 = "0s0gwyy0hybmhc3jij2v9l44b6lkcmclii8bkwsazzj2kc24m2rh"; - }) - ]; + postPatch = '' + # see https://github.com/etal/cnvkit/issues/589 + substituteInPlace setup.py \ + --replace 'joblib < 1.0' 'joblib' + # see https://github.com/etal/cnvkit/issues/680 + substituteInPlace test/test_io.py \ + --replace 'test_read_vcf' 'dont_test_read_vcf' + ''; propagatedBuildInputs = [ biopython @@ -63,8 +64,13 @@ buildPythonPackage rec { ${python.interpreter} test_cnvlib.py ${python.interpreter} test_commands.py ${python.interpreter} test_r.py + popd # test/ ''; + pythonImportsCheck = [ + "cnvlib" + ]; + meta = with lib; { homepage = "https://cnvkit.readthedocs.io"; description = "A Python library and command-line software toolkit to infer and visualize copy number from high-throughput DNA sequencing data";