From 252b66e1875476f6ce3eea413511f435f87a5abb Mon Sep 17 00:00:00 2001 From: tljuniper <48209000+tljuniper@users.noreply.github.com> Date: Mon, 5 Aug 2024 09:40:46 +0200 Subject: [PATCH 01/53] bmap-tools: Replace with bmaptool bmap-tools (https://github.com/intel/bmap-tools) has been archived in April 2024 and marked as moved to yoctoproject/bmaptool (https://github.com/yoctoproject/bmaptool). This renames the file (while migrating to all-packages) and adds an alias. --- .../default.nix => by-name/bm/bmaptool/package.nix} | 10 +++++----- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 6 insertions(+), 7 deletions(-) rename pkgs/{tools/misc/bmap-tools/default.nix => by-name/bm/bmaptool/package.nix} (75%) diff --git a/pkgs/tools/misc/bmap-tools/default.nix b/pkgs/by-name/bm/bmaptool/package.nix similarity index 75% rename from pkgs/tools/misc/bmap-tools/default.nix rename to pkgs/by-name/bm/bmaptool/package.nix index 2f36c452fcb1..2413baa37e80 100644 --- a/pkgs/tools/misc/bmap-tools/default.nix +++ b/pkgs/by-name/bm/bmaptool/package.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { - pname = "bmap-tools"; + pname = "bmaptool"; version = "3.6"; src = fetchFromGitHub { - owner = "intel"; - repo = "bmap-tools"; + owner = "yoctoproject"; + repo = "bmaptool"; rev = "v${version}"; sha256 = "01xzrv5nvd2nvj91lz4x9s91y9825j9pj96z0ap6yvy3w2dgvkkl"; }; @@ -17,8 +17,8 @@ python3Packages.buildPythonApplication rec { doCheck = false; meta = with lib; { - description = "bmap-related tools"; - homepage = "https://github.com/intel/bmap-tools"; + description = "BMAP Tools"; + homepage = "https://github.com/yoctoproject/bmaptool"; license = licenses.gpl2Only; maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4382e04395fe..719ed27be2d8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -170,6 +170,7 @@ mapAliases ({ (lib.optionalAttrs (args ? name) { pname = "blender-" + args.name; }); # Added 2023-10-30 blockbench-electron = blockbench; # Added 2024-03-16 bluezFull = throw "'bluezFull' has been renamed to/replaced by 'bluez'"; # Converted to throw 2023-09-10 + bmap-tools = bmaptool; # Added 2024-08-05 bookletimposer = throw "bookletimposer has been removed from nixpkgs; upstream unmaintained and broke with pypdf3"; # Added 2024-01-01 boost168 = throw "boost168 has been deprecated in favor of the latest version"; # Added 2023-06-08 boost169 = throw "boost169 has been deprecated in favor of the latest version"; # Added 2023-06-08 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d08ebeca01e..6b1c3fc7b9aa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3452,8 +3452,6 @@ with pkgs; blocksat-cli = with python3Packages; toPythonApplication blocksat-cli; - bmap-tools = callPackage ../tools/misc/bmap-tools { }; - bolliedelayxt-lv2 = callPackage ../applications/audio/bolliedelayxt.lv2 { }; bonnmotion = callPackage ../development/tools/misc/bonnmotion { }; From afd564a3e65554591d47456c3bd064421a2f8389 Mon Sep 17 00:00:00 2001 From: tljuniper <48209000+tljuniper@users.noreply.github.com> Date: Mon, 5 Aug 2024 11:59:37 +0200 Subject: [PATCH 02/53] bmaptool: 3.6 -> 3.8.0 --- pkgs/by-name/bm/bmaptool/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bm/bmaptool/package.nix b/pkgs/by-name/bm/bmaptool/package.nix index 2413baa37e80..163aca8edb3b 100644 --- a/pkgs/by-name/bm/bmaptool/package.nix +++ b/pkgs/by-name/bm/bmaptool/package.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "bmaptool"; - version = "3.6"; + version = "3.8.0"; src = fetchFromGitHub { owner = "yoctoproject"; repo = "bmaptool"; rev = "v${version}"; - sha256 = "01xzrv5nvd2nvj91lz4x9s91y9825j9pj96z0ap6yvy3w2dgvkkl"; + sha256 = "sha256-YPY3sNuZ/TASNBPH94iqG6AuBRq5KjioKiuxAcu94+I="; }; propagatedBuildInputs = with python3Packages; [ six ]; From a750f6c5886bcd1b838c1d82ea1d54a7242166b4 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Tue, 20 Aug 2024 15:33:15 +0200 Subject: [PATCH 03/53] changelog-d: 1.0 -> 1.0.1 Release: https://codeberg.org/fgaz/changelog-d/releases/tag/v1.0.1 --- pkgs/development/misc/haskell/changelog-d/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/misc/haskell/changelog-d/default.nix b/pkgs/development/misc/haskell/changelog-d/default.nix index 8f44ed950067..90903e0aae20 100644 --- a/pkgs/development/misc/haskell/changelog-d/default.nix +++ b/pkgs/development/misc/haskell/changelog-d/default.nix @@ -5,13 +5,13 @@ }: mkDerivation rec { pname = "changelog-d"; - version = "1.0"; + version = "1.0.1"; src = fetchFromGitea { domain = "codeberg.org"; owner = "fgaz"; repo = "changelog-d"; rev = "v${version}"; - hash = "sha256-cXczIJb5z+Obq13F90oWcgSN1JAVqRWWw4jp2HT5G5Y="; + hash = "sha256-4TbZD4pXP/5q+t3rTcdCsY5APWIcxhCMM+WsNO/6ke4="; }; isLibrary = false; isExecutable = true; From d956ce0645a6ba98df1500d3c67c9a564729988d Mon Sep 17 00:00:00 2001 From: Matteo Pacini Date: Fri, 23 Aug 2024 09:56:28 +0100 Subject: [PATCH 04/53] bwbasic: fixed darwin build --- pkgs/development/interpreters/bwbasic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/bwbasic/default.nix b/pkgs/development/interpreters/bwbasic/default.nix index a99570888991..4eb5d7dd1312 100644 --- a/pkgs/development/interpreters/bwbasic/default.nix +++ b/pkgs/development/interpreters/bwbasic/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, dos2unix, fetchurl, unzip }: +{ lib, gccStdenv, dos2unix, fetchurl, unzip }: -stdenv.mkDerivation rec { +gccStdenv.mkDerivation rec { pname = "bwbasic"; version = "3.20"; From bfa811869d389f13b8d2ba0c72322bd29f962998 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 Aug 2024 22:16:05 +0000 Subject: [PATCH 05/53] ibus-engines.table: 1.17.6 -> 1.17.7 --- pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix index db93a966b798..186932037d8c 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "ibus-table"; - version = "1.17.6"; + version = "1.17.7"; src = fetchFromGitHub { owner = "kaio"; repo = "ibus-table"; rev = version; - sha256 = "sha256-rbtyixsDMIQAP2TLqp1KbcCUMc7cKvGQR27puJmbLno="; + sha256 = "sha256-oofn/P3iY6dtrtS4VkoH3i21IRtIlVDyF8D+v2n+PgU="; }; postPatch = '' From 8b7eaaefd0ce4ce7eb7849afcbc7237b48699f95 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Aug 2024 00:07:06 +0000 Subject: [PATCH 06/53] simdjson: 3.10.0 -> 3.10.1 --- pkgs/development/libraries/simdjson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/simdjson/default.nix b/pkgs/development/libraries/simdjson/default.nix index 5f2c020c30f6..5adc27e7c106 100644 --- a/pkgs/development/libraries/simdjson/default.nix +++ b/pkgs/development/libraries/simdjson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "simdjson"; - version = "3.10.0"; + version = "3.10.1"; src = fetchFromGitHub { owner = "simdjson"; repo = "simdjson"; rev = "v${version}"; - sha256 = "sha256-MKaYThfAbQiUHBFPAWJatKdLJdmJfsR3o8gp81RE3SI="; + sha256 = "sha256-UfGt5lKmpqc21Hln4t/4KJfg+3V/hqX3UYgpCvlhkrM="; }; nativeBuildInputs = [ cmake ]; From 8e9857bb7ee2a519d12799fafa4a3459c5d620f7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 28 Aug 2024 02:18:59 +0000 Subject: [PATCH 07/53] python312Packages.pysqueezebox: 0.7.1 -> 0.8.1 --- pkgs/development/python-modules/pysqueezebox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysqueezebox/default.nix b/pkgs/development/python-modules/pysqueezebox/default.nix index c3f17e2bf903..9c485b2c0de5 100644 --- a/pkgs/development/python-modules/pysqueezebox/default.nix +++ b/pkgs/development/python-modules/pysqueezebox/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pysqueezebox"; - version = "0.7.1"; + version = "0.8.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "rajlaud"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-WnL9Va3uaWlUHVBtit4v+XdYOFmPpxG91mAHEGwI+7c="; + hash = "sha256-d+8/YyA6tTBxZpiR9pu/5K1v0FOiSrR7RZ7MMBwOzdA="; }; propagatedBuildInputs = [ aiohttp ]; From c9b90a1de3729bb07c40c5212a297cbe5de070ee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 28 Aug 2024 02:26:43 +0000 Subject: [PATCH 08/53] python312Packages.stamina: 24.2.0 -> 24.3.0 --- pkgs/development/python-modules/stamina/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/stamina/default.nix b/pkgs/development/python-modules/stamina/default.nix index eb80b58254ad..9597bc549643 100644 --- a/pkgs/development/python-modules/stamina/default.nix +++ b/pkgs/development/python-modules/stamina/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "stamina"; - version = "24.2.0"; + version = "24.3.0"; pyproject = true; src = fetchFromGitHub { owner = "hynek"; repo = "stamina"; - rev = version; - hash = "sha256-gn8kbLLj+wMPtIwnsOdKDEhBsLApkl3K6mf/bQT3qT8="; + rev = "refs/tags/${version}"; + hash = "sha256-DasubVqKRhX4CRyKyJ3fIA9Rxmy+kGxkW0pDdu8OPPo="; }; nativeBuildInputs = [ From 80c970d69db621a1094e61aea122adcd53a74a76 Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Wed, 28 Aug 2024 09:01:35 +0000 Subject: [PATCH 09/53] nomacs: support more formats This adds support for formats like AVIF, HEIF, JPEG XL, and others. --- pkgs/by-name/no/nomacs/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/no/nomacs/package.nix b/pkgs/by-name/no/nomacs/package.nix index 6e03d7397fb7..a5f17f4b365b 100644 --- a/pkgs/by-name/no/nomacs/package.nix +++ b/pkgs/by-name/no/nomacs/package.nix @@ -43,6 +43,7 @@ stdenv.mkDerivation (finalAttrs: { # see: https://github.com/NixOS/nixpkgs/pull/314186#issuecomment-2129974277 (lib.getOutput "cxxdev" opencv4) ] ++ (with libsForQt5; [ + kimageformats qtbase qtimageformats qtsvg From c71e6eecc6ab73c96e4efa04726a229ad3b45287 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 28 Aug 2024 19:24:55 +0000 Subject: [PATCH 10/53] kubectl-cnpg: 1.23.3 -> 1.24.0 --- .../networking/cluster/kubectl-cnpg/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubectl-cnpg/default.nix b/pkgs/applications/networking/cluster/kubectl-cnpg/default.nix index 5fd38f78ae60..157ff1358ce0 100644 --- a/pkgs/applications/networking/cluster/kubectl-cnpg/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-cnpg/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "kubectl-cnpg"; - version = "1.23.3"; + version = "1.24.0"; src = fetchFromGitHub { owner = "cloudnative-pg"; repo = "cloudnative-pg"; rev = "v${version}"; - hash = "sha256-78XvVPWhsvu7shbU2fJ+/7NnGxUXLLOeR28OPkUUw2A="; + hash = "sha256-/BUrUksNT6KuVLxJxnBfkU9OEeQU3u7WA6pKqcGnuSU="; }; - vendorHash = "sha256-Y5HmoxMLs2rvpLycH5bMd9awHrNeIOkwn7m53hCAWug="; + vendorHash = "sha256-s1fKwWfOSgRw6eOPc1aZzf1VzaTVHXBjQWd1132vAS0="; subPackages = [ "cmd/kubectl-cnpg" ]; From f1c3597d95027fdd8f786716e02c0ed4167842d9 Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 31 Aug 2024 23:29:08 +0100 Subject: [PATCH 11/53] nixos/doc/rl-2411: warn about upcoming macOS version requirement MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For a long time now, the SDK and minimum target version for `x86_64-darwin` has been stuck on macOS 10.12. In the past, the minimum SDK was updated quite regularly; at first, the current situation was just because updating the SDKs was excessively burdensome and nobody was up for doing the work, but the introduction of `aarch64-darwin` with its macOS 11 default SDK has resulted in a long‐term fracture of the two platforms. Per , macOS 10.12 has not received an update since 2017 and went out of security support 5 years ago. Trying to support it in Nixpkgs has been a large burden on the Darwin maintainers, resulting in workarounds, porting work, and even patching functionality out of applications. The existence of Nix users using a macOS version this old is, to my knowledge, entirely theoretical, and we pay in both maintenance costs and functionality: for instance, applications built for `x86_64-darwin` do not support automatic dark mode switching by default. This situation has always been suboptimal, but it is now becoming untenable. Python, a critical component of the Nixpkgs standard environment for builds, is dropping support for versions older than 10.13 in 3.13: . Qt 6 only supports macOS 11 and newer. libuv only supports the versions Apple does, and is a ticking time bomb due to its use in the standard environment. QEMU only supports the last two macOS releases, and won’t build with an SDK older than macOS 12; we previously vendored a set of backporting changes and functionality‐removing reverts to keep it building for 10.12, but this also became overly onerous, and we gave up in . `x86_64-darwin` is a platform with a limited upstream future. Apple no longer sells any hardware that runs it natively, and it is unclear how much longer they will support it in the operating system. There are still many users of the platform, myself included, so we shouldn’t drop support for it prematurely, but it’s unreasonable to try and patch the entire world to keep it supporting insecure versions of the OS that only run on hardware that is no longer sold. Therefore, this adds a release note to warn users ahead of time that 25.05 will only support macOS 11 and newer, as suggested by the 24.05 release team when the possibility of bumping the required version was raised. Why target Big Sur, rather than any other version? The reason is simple: it’s the same SDK and deployment target as `aarch64-darwin`. There are many packages that work on `aarch64-darwin` but not `x86_64-darwin`, and Darwin maintainers frequently need to be called in to fix things that work fine on the newer platform but not the older one. This change will increase the health of `x86_64-darwin` by aligning the SDK versions and support between the two platforms; the vast majority of packages that work on one will Just Work on the other. macOS 11 is almost four years old and has itself been out of security support for a year now, but as the first version to support Apple Silicon, it’s a far more compatible base for us to build our Darwin packages for. Any future change in supported versions should be synchronized between the two Darwin architectures. When 25.05 is released, users on old, unsupported versions of macOS will have the following options: * Update to a new macOS version. For users that are on hardware that Apple has dropped support for, OpenCore Legacy Patcher () can enable the use of newer macOS versions on hardware even older than 10.12 supports. * Install NixOS. That obviously precludes the use of macOS software (though most of that software has already dropped support for 10.12), but will give users a secure, supported operating system that we can actually own the support for going forward. * Keep using 24.11 forever. Since they’re not getting updates to their OS and core applications anyway, this is likely to be acceptable to many users. * Switch to MacPorts. They support all the way back to 10.6 for `x86_64-darwin` by building packages separately for every OS release, though not every package is available for every version. * Send patches. We *may* accept non‐invasive patches to keep certain critical packages (such as the core `stdenv` packages) building for old OS versions, on a case‐by‐case basis, but we can’t guarantee it. This will ultimately have to be a decision made by package maintainers and personally I doubt this will be a viable path to sustainably support older versions. --- nixos/doc/manual/release-notes/rl-2411.section.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index dd8d377e14eb..155573f318e2 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -4,6 +4,12 @@ ## Highlights {#sec-release-24.11-highlights} +- **This will be the latest version of Nixpkgs to support macOS 10.12 (Sierra).** + Starting with release 25.05, the minimum supported version will be macOS 11 (Big Sur). + From that point on, packages may or may not work on older releases of macOS. + Users on old macOS versions should consider upgrading to a supported OS release (potentially using [OpenCore Legacy Patcher](https://dortania.github.io/OpenCore-Legacy-Patcher/) for old hardware) or installing NixOS. + If neither of those options are viable and you require new versions of software, [MacPorts](https://www.macports.org/) supports back to OS X 10.6 (Snow Leopard). + - Convenience options for `amdgpu`, open source driver for Radeon cards, is now available under `hardware.amdgpu`. - [AMDVLK](https://github.com/GPUOpen-Drivers/AMDVLK), AMD's open source Vulkan driver, is now available to be configured as `hardware.amdgpu.amdvlk` option. From e9941fbadd8470895aa1d85f0bc8ec7c604f352e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 1 Sep 2024 02:08:17 +0000 Subject: [PATCH 12/53] python312Packages.ghapi: 1.0.3 -> 1.0.6 --- pkgs/development/python-modules/ghapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ghapi/default.nix b/pkgs/development/python-modules/ghapi/default.nix index 154f3b86614d..9e88007a08c4 100644 --- a/pkgs/development/python-modules/ghapi/default.nix +++ b/pkgs/development/python-modules/ghapi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ghapi"; - version = "1.0.3"; + version = "1.0.6"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "fastai"; repo = "ghapi"; rev = "refs/tags/${version}"; - hash = "sha256-nH3OciLhet4620WAEmm8mUAmlnpniyIsF2oIzqbZ7FI="; + hash = "sha256-ii19wuFAxMiGce37TNXRNSdvMcGWQjCfPukeqxySYnc="; }; propagatedBuildInputs = [ From 8dce7dafcf0368f8007393f555a432ae5b373271 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Tue, 23 Apr 2024 07:14:39 -0400 Subject: [PATCH 13/53] glfw-minecraft: merge glfw-wayland-minecraft into glfw The set-cursor patch is taken from: And other changes including fractional scaling is already upstreamed in 3.4 thus not needed anymore. Co-authored-by: oxalica Signed-off-by: Sefa Eyeoglu --- ...rsor-position-until-the-cursor-is-lo.patch | 59 +++++++++++++++++ .../3.x.nix => by-name/gl/glfw3/package.nix} | 23 ++++--- .../glfw => by-name/gl/glfw3}/x11.patch | 0 .../libraries/glfw/3.x-wayland-minecraft.nix | 64 ------------------- pkgs/development/libraries/glfw/wayland.patch | 25 -------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 6 +- 7 files changed, 78 insertions(+), 100 deletions(-) create mode 100644 pkgs/by-name/gl/glfw3/0009-Defer-setting-cursor-position-until-the-cursor-is-lo.patch rename pkgs/{development/libraries/glfw/3.x.nix => by-name/gl/glfw3/package.nix} (79%) rename pkgs/{development/libraries/glfw => by-name/gl/glfw3}/x11.patch (100%) delete mode 100644 pkgs/development/libraries/glfw/3.x-wayland-minecraft.nix delete mode 100644 pkgs/development/libraries/glfw/wayland.patch diff --git a/pkgs/by-name/gl/glfw3/0009-Defer-setting-cursor-position-until-the-cursor-is-lo.patch b/pkgs/by-name/gl/glfw3/0009-Defer-setting-cursor-position-until-the-cursor-is-lo.patch new file mode 100644 index 000000000000..70cec99815e9 --- /dev/null +++ b/pkgs/by-name/gl/glfw3/0009-Defer-setting-cursor-position-until-the-cursor-is-lo.patch @@ -0,0 +1,59 @@ +From 9997ae55a47de469ea26f8437c30b51483abda5f Mon Sep 17 00:00:00 2001 +From: Dan Klishch +Date: Sat, 30 Sep 2023 23:38:05 -0400 +Subject: Defer setting cursor position until the cursor is locked + +--- + src/wl_platform.h | 3 +++ + src/wl_window.c | 14 ++++++++++++-- + 2 files changed, 15 insertions(+), 2 deletions(-) + +diff --git a/src/wl_platform.h b/src/wl_platform.h +index ca34f66e..cd1f227f 100644 +--- a/src/wl_platform.h ++++ b/src/wl_platform.h +@@ -403,6 +403,9 @@ typedef struct _GLFWwindowWayland + int scaleSize; + int compositorPreferredScale; + ++ double askedCursorPosX, askedCursorPosY; ++ GLFWbool didAskForSetCursorPos; ++ + struct zwp_relative_pointer_v1* relativePointer; + struct zwp_locked_pointer_v1* lockedPointer; + struct zwp_confined_pointer_v1* confinedPointer; +diff --git a/src/wl_window.c b/src/wl_window.c +index 1de26558..0df16747 100644 +--- a/src/wl_window.c ++++ b/src/wl_window.c +@@ -2586,8 +2586,9 @@ void _glfwGetCursorPosWayland(_GLFWwindow* window, double* xpos, double* ypos) + + void _glfwSetCursorPosWayland(_GLFWwindow* window, double x, double y) + { +- _glfwInputError(GLFW_FEATURE_UNAVAILABLE, +- "Wayland: The platform does not support setting the cursor position"); ++ window->wl.didAskForSetCursorPos = true; ++ window->wl.askedCursorPosX = x; ++ window->wl.askedCursorPosY = y; + } + + void _glfwSetCursorModeWayland(_GLFWwindow* window, int mode) +@@ -2819,6 +2820,15 @@ static const struct zwp_relative_pointer_v1_listener relativePointerListener = + static void lockedPointerHandleLocked(void* userData, + struct zwp_locked_pointer_v1* lockedPointer) + { ++ _GLFWwindow* window = userData; ++ ++ if (window->wl.didAskForSetCursorPos) ++ { ++ window->wl.didAskForSetCursorPos = false; ++ zwp_locked_pointer_v1_set_cursor_position_hint(window->wl.lockedPointer, ++ wl_fixed_from_double(window->wl.askedCursorPosX), ++ wl_fixed_from_double(window->wl.askedCursorPosY)); ++ } + } + + static void lockedPointerHandleUnlocked(void* userData, +-- +2.42.0 + diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/by-name/gl/glfw3/package.nix similarity index 79% rename from pkgs/development/libraries/glfw/3.x.nix rename to pkgs/by-name/gl/glfw3/package.nix index 2ec1f42d2840..33b22890387a 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/by-name/gl/glfw3/package.nix @@ -1,13 +1,16 @@ { stdenv, lib, fetchFromGitHub, cmake , libGL, libXrandr, libXinerama, libXcursor, libX11, libXi, libXext -, Carbon, Cocoa, Kernel, fixDarwinDylibNames +, darwin, fixDarwinDylibNames , extra-cmake-modules, wayland , wayland-scanner, wayland-protocols, libxkbcommon, libdecor +, withMinecraftPatch ? false }: - -stdenv.mkDerivation rec { +let version = "3.4"; - pname = "glfw"; +in +stdenv.mkDerivation { + pname = "glfw${lib.optionalString withMinecraftPatch "-minecraft"}"; + inherit version; src = fetchFromGitHub { owner = "glfw"; @@ -17,16 +20,20 @@ stdenv.mkDerivation rec { }; # Fix linkage issues on X11 (https://github.com/NixOS/nixpkgs/issues/142583) - patches = ./x11.patch; + patches = [ + ./x11.patch + ] ++ lib.optionals withMinecraftPatch [ + ./0009-Defer-setting-cursor-position-until-the-cursor-is-lo.patch + ]; propagatedBuildInputs = [ libGL ]; nativeBuildInputs = [ cmake extra-cmake-modules ] - ++ lib.optional stdenv.isDarwin fixDarwinDylibNames + ++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ] ++ lib.optionals stdenv.isLinux [ wayland-scanner ]; buildInputs = - lib.optionals stdenv.isDarwin [ Carbon Cocoa Kernel ] + lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Carbon Cocoa Kernel ]) ++ lib.optionals stdenv.isLinux [ wayland wayland-protocols @@ -64,7 +71,7 @@ stdenv.mkDerivation rec { description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time"; homepage = "https://www.glfw.org/"; license = licenses.zlib; - maintainers = with maintainers; [ marcweber twey ]; + maintainers = with maintainers; [ marcweber Scrumplex twey ]; platforms = platforms.unix ++ platforms.windows; }; } diff --git a/pkgs/development/libraries/glfw/x11.patch b/pkgs/by-name/gl/glfw3/x11.patch similarity index 100% rename from pkgs/development/libraries/glfw/x11.patch rename to pkgs/by-name/gl/glfw3/x11.patch diff --git a/pkgs/development/libraries/glfw/3.x-wayland-minecraft.nix b/pkgs/development/libraries/glfw/3.x-wayland-minecraft.nix deleted file mode 100644 index 03baa891b3b4..000000000000 --- a/pkgs/development/libraries/glfw/3.x-wayland-minecraft.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch2, cmake, extra-cmake-modules -, libGL, wayland, wayland-protocols, libxkbcommon, libdecor -}: - -stdenv.mkDerivation { - version = "unstable-2023-06-01"; - pname = "glfw-wayland-minecraft"; - - src = fetchFromGitHub { - owner = "glfw"; - repo = "GLFW"; - rev = "3eaf1255b29fdf5c2895856c7be7d7185ef2b241"; - sha256 = "sha256-UnwuE/3q6I4dS5syagpnqrDEVDK9XSVdyOg7KNkdUUA="; - }; - - patches = [ - (fetchpatch2 { - url = "https://raw.githubusercontent.com/Admicos/minecraft-wayland/15f88a515c63a9716cfdf4090fab8e16543f4ebd/0003-Don-t-crash-on-calls-to-focus-or-icon.patch"; - hash = "sha256-NZbKh16h+tWXXnz13QcFBFaeGXMNxZKGQb9xJEahFnE="; - }) - (fetchpatch2 { - url = "https://raw.githubusercontent.com/Admicos/minecraft-wayland/15f88a515c63a9716cfdf4090fab8e16543f4ebd/0005-Add-warning-about-being-an-unofficial-patch.patch"; - hash = "sha256-QMUNlnlCeFz5gIVdbM+YXPsrmiOl9cMwuVRSOvlw+T0="; - }) - ]; - - propagatedBuildInputs = [ libGL ]; - - nativeBuildInputs = [ cmake extra-cmake-modules ]; - - buildInputs = [ wayland wayland-protocols libxkbcommon ]; - - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" - "-DGLFW_BUILD_WAYLAND=ON" - "-DGLFW_BUILD_X11=OFF" - "-DCMAKE_C_FLAGS=-D_GLFW_EGL_LIBRARY='\"${lib.getLib libGL}/lib/libEGL.so.1\"'" - ]; - - postPatch = '' - substituteInPlace src/wl_init.c \ - --replace "libxkbcommon.so.0" "${lib.getLib libxkbcommon}/lib/libxkbcommon.so.0" - - substituteInPlace src/wl_init.c \ - --replace "libdecor-0.so.0" "${lib.getLib libdecor}/lib/libdecor-0.so.0" - - substituteInPlace src/wl_init.c \ - --replace "libwayland-client.so.0" "${lib.getLib wayland}/lib/libwayland-client.so.0" - - substituteInPlace src/wl_init.c \ - --replace "libwayland-cursor.so.0" "${lib.getLib wayland}/lib/libwayland-cursor.so.0" - - substituteInPlace src/wl_init.c \ - --replace "libwayland-egl.so.1" "${lib.getLib wayland}/lib/libwayland-egl.so.1" - ''; - - meta = with lib; { - description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time - with patches to support Minecraft on Wayland"; - homepage = "https://www.glfw.org/"; - license = licenses.zlib; - maintainers = with maintainers; [ Scrumplex ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/glfw/wayland.patch b/pkgs/development/libraries/glfw/wayland.patch deleted file mode 100644 index c0c338f845b3..000000000000 --- a/pkgs/development/libraries/glfw/wayland.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 46fb81c69e8acdb70907409f98dd01e387408414 Mon Sep 17 00:00:00 2001 -From: Stone Tickle -Date: Fri, 5 Jun 2020 12:51:25 +0900 -Subject: [PATCH] set O_NONBLOCK on repeat timerfd - ---- - src/wl_init.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/wl_init.c b/src/wl_init.c -index 49e7cc52..43569bef 100644 ---- a/src/wl_init.c -+++ b/src/wl_init.c -@@ -1166,7 +1166,7 @@ int _glfwPlatformInit(void) - - _glfw.wl.timerfd = -1; - if (_glfw.wl.seatVersion >= 4) -- _glfw.wl.timerfd = timerfd_create(CLOCK_MONOTONIC, TFD_CLOEXEC); -+ _glfw.wl.timerfd = timerfd_create(CLOCK_MONOTONIC, TFD_CLOEXEC | TFD_NONBLOCK); - - if (_glfw.wl.pointer && _glfw.wl.shm) - { --- -2.31.1 - diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 65ac0671b249..c4ebe58129b3 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -525,6 +525,7 @@ mapAliases ({ glew-egl = lib.warn "'glew-egl' is now provided by 'glew' directly" glew; # Added 2024-08-11 glide = throw "'glide' has been removed as it is unmaintained, please use Go modules instead"; # Added 2023-12-26 glfw-wayland = glfw; # Added 2024-04-19 + glfw-wayland-minecraft = glfw3-minecraft; # Added 2024-05-08 glxinfo = mesa-demos; # Added 2024-07-04 gmailieer = lieer; # Added 2020-04-19 gmic-qt-krita = throw "gmic-qt-krita was removed as it's no longer supported upstream."; # Converted to throw 2023-02-02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6cf3a6269a89..ba6349fd39ac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20262,10 +20262,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AGL OpenGL; }; glfw = glfw3; - glfw-wayland-minecraft = callPackage ../development/libraries/glfw/3.x-wayland-minecraft.nix {}; glfw2 = callPackage ../development/libraries/glfw/2.x.nix { }; - glfw3 = callPackage ../development/libraries/glfw/3.x.nix { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa Kernel; + + glfw3-minecraft = callPackage ../by-name/gl/glfw3/package.nix { + withMinecraftPatch = true; }; glibc = callPackage ../development/libraries/glibc { From 2a5017a5550a32dfdf4000bd8fa2fea89e6a0f95 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Wed, 8 May 2024 12:34:01 +0200 Subject: [PATCH 14/53] prismlauncher: deprecate withWaylandGLFW option Signed-off-by: Sefa Eyeoglu --- pkgs/by-name/pr/prismlauncher/package.nix | 46 ++++------------------- 1 file changed, 7 insertions(+), 39 deletions(-) diff --git a/pkgs/by-name/pr/prismlauncher/package.nix b/pkgs/by-name/pr/prismlauncher/package.nix index c1425a3099bd..b74fce498767 100644 --- a/pkgs/by-name/pr/prismlauncher/package.nix +++ b/pkgs/by-name/pr/prismlauncher/package.nix @@ -7,9 +7,7 @@ alsa-lib, flite, gamemode, - glfw, - glfw-wayland-minecraft, - mesa-demos, + glfw3-minecraft, jdk8, jdk17, jdk21, @@ -18,7 +16,7 @@ libjack2, libpulseaudio, libusb1, - makeWrapper, + mesa-demos, openal, pciutils, pipewire, @@ -37,15 +35,6 @@ ], msaClientID ? null, textToSpeechSupport ? stdenv.isLinux, - - # Adds `glfw-wayland-minecraft` to `LD_LIBRARY_PATH` - # when launched on wayland, allowing for the game to be run natively. - # Make sure to enable "Use system installation of GLFW" in instance settings - # for this to take effect - # - # Warning: This build of glfw may be unstable, and the launcher - # itself can take slightly longer to start - withWaylandGLFW ? false, }: assert lib.assertMsg ( @@ -56,10 +45,6 @@ assert lib.assertMsg ( textToSpeechSupport -> stdenv.isLinux ) "textToSpeechSupport only has an effect on Linux."; -assert lib.assertMsg ( - withWaylandGLFW -> stdenv.isLinux -) "withWaylandGLFW is only available on Linux."; - let prismlauncher' = prismlauncher-unwrapped.override { inherit msaClientID gamemodeSupport; }; in @@ -69,11 +54,7 @@ symlinkJoin { paths = [ prismlauncher' ]; - nativeBuildInputs = - [ kdePackages.wrapQtAppsHook ] - # purposefully using a shell wrapper here for variable expansion - # see https://github.com/NixOS/nixpkgs/issues/172583 - ++ lib.optional withWaylandGLFW makeWrapper; + nativeBuildInputs = [ kdePackages.wrapQtAppsHook ]; buildInputs = [ @@ -84,30 +65,17 @@ symlinkJoin { lib.versionAtLeast kdePackages.qtbase.version "6" && stdenv.isLinux ) kdePackages.qtwayland; - env = { - waylandPreExec = lib.optionalString withWaylandGLFW '' - if [ -n "$WAYLAND_DISPLAY" ]; then - export LD_LIBRARY_PATH=${lib.getLib glfw-wayland-minecraft}/lib:"$LD_LIBRARY_PATH" - fi - ''; - }; - - postBuild = - lib.optionalString withWaylandGLFW '' - qtWrapperArgs+=(--run "$waylandPreExec") - '' - + '' - wrapQtAppsHook - ''; + postBuild = '' + wrapQtAppsHook + ''; qtWrapperArgs = let runtimeLibs = [ - # lwjgl stdenv.cc.cc.lib ## native versions - glfw + glfw3-minecraft openal ## openal From 697d24d5de386b27ca0214519788cbe28ad6e945 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Mon, 12 Aug 2024 23:10:23 +0200 Subject: [PATCH 15/53] prismlauncher: use top level X11 packages Signed-off-by: Sefa Eyeoglu --- pkgs/by-name/pr/prismlauncher/package.nix | 29 +++++++++++++---------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/pr/prismlauncher/package.nix b/pkgs/by-name/pr/prismlauncher/package.nix index b74fce498767..b58622271b6e 100644 --- a/pkgs/by-name/pr/prismlauncher/package.nix +++ b/pkgs/by-name/pr/prismlauncher/package.nix @@ -1,18 +1,20 @@ { - lib, - stdenv, - symlinkJoin, - prismlauncher-unwrapped, addDriverRunpath, alsa-lib, flite, gamemode, glfw3-minecraft, - jdk8, jdk17, jdk21, + jdk8, kdePackages, + lib, libGL, + libX11, + libXcursor, + libXext, + libXrandr, + libXxf86vm, libjack2, libpulseaudio, libusb1, @@ -20,9 +22,12 @@ openal, pciutils, pipewire, + prismlauncher-unwrapped, + stdenv, + symlinkJoin, udev, vulkan-loader, - xorg, + xrandr, additionalLibs ? [ ], additionalPrograms ? [ ], @@ -86,11 +91,11 @@ symlinkJoin { ## glfw libGL - xorg.libX11 - xorg.libXext - xorg.libXcursor - xorg.libXrandr - xorg.libXxf86vm + libX11 + libXcursor + libXext + libXrandr + libXxf86vm udev # oshi @@ -104,7 +109,7 @@ symlinkJoin { runtimePrograms = [ mesa-demos pciutils # need lspci - xorg.xrandr # needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 + xrandr # needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 ] ++ additionalPrograms; in From dbdf66b130bc6f0e51b15333a3fcf0043b06559a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 1 Sep 2024 17:35:37 +0000 Subject: [PATCH 16/53] python312Packages.webdataset: 0.2.96 -> 0.2.100 --- pkgs/development/python-modules/webdataset/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/webdataset/default.nix b/pkgs/development/python-modules/webdataset/default.nix index 17a2d3c081b6..3c5b74eed4ae 100644 --- a/pkgs/development/python-modules/webdataset/default.nix +++ b/pkgs/development/python-modules/webdataset/default.nix @@ -17,14 +17,14 @@ }: buildPythonPackage rec { pname = "webdataset"; - version = "0.2.96"; + version = "0.2.100"; pyproject = true; src = fetchFromGitHub { owner = "webdataset"; repo = "webdataset"; rev = "refs/tags/${version}"; - hash = "sha256-Wz6dLi2xW9aF+QjDx4yn64zU7u7SCyDXVKkS+1TyYaU="; + hash = "sha256-+Rvb4VY4qBcVKM1CUkLZTQdlZklpHcuiMO8r6VNInLc="; }; build-system = [ From cbfa64a5777ef758210b2130c756c875ced5dd04 Mon Sep 17 00:00:00 2001 From: tu-maurice Date: Sun, 1 Sep 2024 21:20:23 +0200 Subject: [PATCH 17/53] cairo-lang: 2.5.4 -> 2.8.0 --- pkgs/development/compilers/cairo/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/cairo/default.nix b/pkgs/development/compilers/cairo/default.nix index 51b6c641da94..10dc215065ab 100644 --- a/pkgs/development/compilers/cairo/default.nix +++ b/pkgs/development/compilers/cairo/default.nix @@ -2,20 +2,26 @@ , rustPlatform , fetchFromGitHub , rustfmt +, perl }: rustPlatform.buildRustPackage rec { pname = "cairo"; - version = "2.5.4"; + version = "2.8.0"; src = fetchFromGitHub { owner = "starkware-libs"; repo = "cairo"; rev = "v${version}"; - hash = "sha256-ctb5VingMczzHLyyEjKgFKNAZI3/fqzjFW/RQGDSsyQ="; + hash = "sha256-zQ+kc4c8YI9vURUEQNqX55mTJBcc2NLp4K8kab3ZjEs="; }; - cargoHash = "sha256-T21GuGQaX/VD907MEGp68bQPXrRK0it4o1nLEdHwTsE="; + cargoHash = "sha256-3ah6cHyCppkLJ2e73aGhVemyMRBl9R5a6ufWHmrJHSk="; + + # openssl crate requires perl during build process + nativeBuildInputs = [ + perl + ]; nativeCheckInputs = [ rustfmt @@ -24,6 +30,9 @@ rustPlatform.buildRustPackage rec { checkFlags = [ # Requires a mythical rustfmt 2.0 or a nightly compiler "--skip=golden_test::sourcegen_ast" + + # Test broken + "--skip=test_lowering_consistency" ]; postInstall = '' From 7fc4e0e7c6ba59580b413492374e7525fd7e3073 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Sun, 1 Sep 2024 21:33:10 +0200 Subject: [PATCH 18/53] liberasurecode: format with nixfmt-rfc-style --- .../misc/liberasurecode/default.nix | 27 ++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/misc/liberasurecode/default.nix b/pkgs/applications/misc/liberasurecode/default.nix index f94496d0b125..e501324ecee5 100644 --- a/pkgs/applications/misc/liberasurecode/default.nix +++ b/pkgs/applications/misc/liberasurecode/default.nix @@ -1,17 +1,22 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, doxygen -, installShellFiles -, zlib +{ + lib, + stdenv, + autoreconfHook, + doxygen, + fetchFromGitHub, + installShellFiles, + zlib, }: stdenv.mkDerivation rec { pname = "liberasurecode"; version = "1.6.3"; - outputs = [ "out" "dev" "doc" ]; + outputs = [ + "out" + "dev" + "doc" + ]; src = fetchFromGitHub { owner = "openstack"; @@ -28,7 +33,11 @@ stdenv.mkDerivation rec { --replace "-Werror" "" ''; - nativeBuildInputs = [ autoreconfHook doxygen installShellFiles ]; + nativeBuildInputs = [ + autoreconfHook + doxygen + installShellFiles + ]; buildInputs = [ zlib ]; From c3bda7ebcb79fabc637461755654b3451878c39c Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Sun, 1 Sep 2024 21:33:56 +0200 Subject: [PATCH 19/53] liberasurecode: migrate to pkgs/by-name --- .../default.nix => by-name/li/liberasurecode/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/misc/liberasurecode/default.nix => by-name/li/liberasurecode/package.nix} (100%) diff --git a/pkgs/applications/misc/liberasurecode/default.nix b/pkgs/by-name/li/liberasurecode/package.nix similarity index 100% rename from pkgs/applications/misc/liberasurecode/default.nix rename to pkgs/by-name/li/liberasurecode/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 322d2cf6b766..d5fb30beb1d8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19925,8 +19925,6 @@ with pkgs; libesmtp = callPackage ../development/libraries/libesmtp { }; - liberasurecode = callPackage ../applications/misc/liberasurecode { }; - example-robot-data = callPackage ../development/libraries/example-robot-data { }; exiv2 = callPackage ../development/libraries/exiv2 { }; From 5eeb24425935bb2422910ca2627960004a3ee48b Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Sun, 1 Sep 2024 21:31:46 +0200 Subject: [PATCH 20/53] liberasurecode: 1.6.3 -> 1.6.4 https://github.com/openstack/liberasurecode/compare/1.6.3...1.6.4 --- pkgs/by-name/li/liberasurecode/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/li/liberasurecode/package.nix b/pkgs/by-name/li/liberasurecode/package.nix index e501324ecee5..e2ae9d380f83 100644 --- a/pkgs/by-name/li/liberasurecode/package.nix +++ b/pkgs/by-name/li/liberasurecode/package.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "liberasurecode"; - version = "1.6.3"; + version = "1.6.4"; outputs = [ "out" @@ -20,17 +20,17 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "openstack"; - repo = pname; - rev = version; - sha256 = "sha256-HCp+FQ9nq4twk6FtfKhzT80wXXJbvG+clrDO2/9ATpU="; + repo = "liberasurecode"; + rev = "refs/tags/${version}"; + hash = "sha256-KYXlRjUudWhFbhyv9V1fmqwBw3/vTBfusxafaNG+Q40="; }; postPatch = '' substituteInPlace doc/doxygen.cfg.in \ - --replace "GENERATE_MAN = NO" "GENERATE_MAN = YES" + --replace-fail "GENERATE_MAN = NO" "GENERATE_MAN = YES" substituteInPlace Makefile.am src/Makefile.am \ - --replace "-Werror" "" + --replace-fail "-Werror" "" ''; nativeBuildInputs = [ From f510a49e54ed793cbe7a258e19b7ae5595c326b8 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Sun, 1 Sep 2024 21:39:14 +0200 Subject: [PATCH 21/53] liberasurecode: add passthru.tests.pkg-config, meta.pkgConfigModules --- pkgs/by-name/li/liberasurecode/package.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/liberasurecode/package.nix b/pkgs/by-name/li/liberasurecode/package.nix index e2ae9d380f83..1f4cb055cc99 100644 --- a/pkgs/by-name/li/liberasurecode/package.nix +++ b/pkgs/by-name/li/liberasurecode/package.nix @@ -5,10 +5,11 @@ doxygen, fetchFromGitHub, installShellFiles, + testers, zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "liberasurecode"; version = "1.6.4"; @@ -21,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "openstack"; repo = "liberasurecode"; - rev = "refs/tags/${version}"; + rev = "refs/tags/${finalAttrs.version}"; hash = "sha256-KYXlRjUudWhFbhyv9V1fmqwBw3/vTBfusxafaNG+Q40="; }; @@ -56,10 +57,15 @@ stdenv.mkDerivation rec { checkTarget = "test"; + passthru.tests.pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; + meta = with lib; { description = "Erasure Code API library written in C with pluggable Erasure Code backends"; homepage = "https://github.com/openstack/liberasurecode"; license = licenses.bsd2; maintainers = teams.openstack.members; + pkgConfigModules = [ "erasurecode-1" ]; }; -} +}) From 9d60285f79704e3aaa1565ef2202fee001926673 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Sun, 1 Sep 2024 21:49:44 +0200 Subject: [PATCH 22/53] python311Packages.pyeclib: unstable-2022-03-11 -> 1.6.1 https://github.com/openstack/pyeclib/compare/b50040969a03f7566ffcb468336e875d21486113...1.6.1 --- .../python-modules/pyeclib/default.nix | 28 +++++++++++++------ 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pyeclib/default.nix b/pkgs/development/python-modules/pyeclib/default.nix index 70fb7aeb5975..0ada1b1306bd 100644 --- a/pkgs/development/python-modules/pyeclib/default.nix +++ b/pkgs/development/python-modules/pyeclib/default.nix @@ -2,32 +2,41 @@ lib, stdenv, buildPythonPackage, + distutils, fetchFromGitHub, liberasurecode, + pytestCheckHook, + setuptools, six, }: buildPythonPackage rec { pname = "pyeclib"; - version = "unstable-2022-03-11"; - format = "setuptools"; + version = "1.6.1"; + pyproject = true; src = fetchFromGitHub { owner = "openstack"; repo = "pyeclib"; - rev = "b50040969a03f7566ffcb468336e875d21486113"; - hash = "sha256-nYYjocStC0q/MC6pum3J4hlXiu/R5xODwIE97Ho3iEY="; + rev = "refs/tags/${version}"; + hash = "sha256-pa3majZ68+DQGtgGCpZVRshof+w9jvpxreo4dkckLXk="; }; postPatch = '' # patch dlopen call substituteInPlace src/c/pyeclib_c/pyeclib_c.c \ - --replace "liberasurecode.so" "${liberasurecode}/lib/liberasurecode.so" + --replace-fail "liberasurecode.so" "${liberasurecode}/lib/liberasurecode.so" + # python's platform.platform() doesn't return "Darwin" (anymore?) substituteInPlace setup.py \ - --replace '"Darwin"' '"macOS"' + --replace-fail '"Darwin"' '"macOS"' ''; + build-system = [ + distutils + setuptools + ]; + preBuild = let ldLibraryPathEnvName = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; @@ -37,9 +46,12 @@ buildPythonPackage rec { export ${ldLibraryPathEnvName}="${lib.makeLibraryPath [ liberasurecode ]}" ''; - buildInputs = [ liberasurecode ]; + dependencies = [ liberasurecode ]; - nativeCheckInputs = [ six ]; + nativeCheckInputs = [ + pytestCheckHook + six + ]; pythonImportsCheck = [ "pyeclib" ]; From ca8ebb9de33d4a417ea91dd70c6800245a229cbe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 1 Sep 2024 21:03:25 +0000 Subject: [PATCH 23/53] renode-dts2repl: 0-unstable-2024-08-20 -> 0-unstable-2024-08-30 --- pkgs/by-name/re/renode-dts2repl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/renode-dts2repl/package.nix b/pkgs/by-name/re/renode-dts2repl/package.nix index 87a6ece3d035..f1ecbaa46452 100644 --- a/pkgs/by-name/re/renode-dts2repl/package.nix +++ b/pkgs/by-name/re/renode-dts2repl/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication { pname = "renode-dts2repl"; - version = "0-unstable-2024-08-20"; + version = "0-unstable-2024-08-30"; pyproject = true; src = fetchFromGitHub { owner = "antmicro"; repo = "dts2repl"; - rev = "ca0e43957140ee0cd7795b7a42ffb04fdcb98328"; - hash = "sha256-6SgnYFta9FgHhc6Da1ItFO/UK2UtXU14bTl+sjX0I9s="; + rev = "231e1330c3210d31f08bf739ef69f096f0732291"; + hash = "sha256-oD67tMJ23FBZzELtTdFZ2E7AtKs9m3T6L1rRuibfvY8="; }; nativeBuildInputs = [ From dad5a626744be3c22915df72631277b83f803c3e Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 31 Aug 2024 09:19:01 +0200 Subject: [PATCH 24/53] mesa.meta.platforms: broaden While there's a lot in Mesa that's architecture-specific, there's also portable stuff that should be able to build for basically any Unix out there. It should work on almost any Linux architecture, and it's also used by every BSD I think. --- pkgs/development/libraries/mesa/common.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/development/libraries/mesa/common.nix b/pkgs/development/libraries/mesa/common.nix index d73174195f3a..37ae8905891f 100644 --- a/pkgs/development/libraries/mesa/common.nix +++ b/pkgs/development/libraries/mesa/common.nix @@ -29,11 +29,7 @@ rec { homepage = "https://www.mesa3d.org/"; changelog = "https://www.mesa3d.org/relnotes/${version}.html"; license = with lib.licenses; [ mit ]; # X11 variant, in most files - platforms = [ - "i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" - "armv6l-linux" "armv7l-linux" "armv7a-linux" "aarch64-linux" - "powerpc64-linux" "powerpc64le-linux" "aarch64-darwin" "riscv64-linux" - ]; + platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ primeos vcunat ]; # Help is welcome :) }; } From ab8bf8c35beb13d6d3d1ac9cfe1ea30d29894e53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 30 Aug 2024 11:31:26 +0200 Subject: [PATCH 25/53] lib/modules: improve error message when option is being accessed that isn't defined --- lib/modules.nix | 2 +- lib/tests/modules.sh | 8 ++++---- pkgs/tools/nix/nixos-option/src/nixos-option.cc | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/modules.nix b/lib/modules.nix index b9e9ca1e5d78..c097f947cc4b 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -861,7 +861,7 @@ let else # (nixos-option detects this specific error message and gives it special # handling. If changed here, please change it there too.) - throw "The option `${showOption loc}' is used but not defined."; + throw "The option `${showOption loc}' was accessed but has no value defined. Try setting the option."; isDefined = defsFinal != []; diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index 3301a3d987ee..68b192294076 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -304,7 +304,7 @@ checkConfigOutput '^".*Hello.*"$' options.namedPackage.description ./declare-mkP checkConfigOutput '^"hello"$' config.pathPackage.pname ./declare-mkPackageOption.nix checkConfigOutput '^"pkgs\.hello\.override \{ stdenv = pkgs\.clangStdenv; \}"$' options.packageWithExample.example.text ./declare-mkPackageOption.nix checkConfigOutput '^".*Example extra description\..*"$' options.packageWithExtraDescription.description ./declare-mkPackageOption.nix -checkConfigError 'The option .undefinedPackage. is used but not defined' config.undefinedPackage ./declare-mkPackageOption.nix +checkConfigError 'The option .undefinedPackage. was accessed but has no value defined. Try setting the option.' config.undefinedPackage ./declare-mkPackageOption.nix checkConfigOutput '^null$' config.nullablePackage ./declare-mkPackageOption.nix checkConfigOutput '^"null or package"$' options.nullablePackageWithDefault.type.description ./declare-mkPackageOption.nix checkConfigOutput '^"myPkgs\.hello"$' options.packageWithPkgsText.defaultText.text ./declare-mkPackageOption.nix @@ -402,7 +402,7 @@ checkConfigOutput '^null$' config.foo ./freeform-attrsOf.nix ./freeform-str-dep- checkConfigOutput '^"24"$' config.foo ./freeform-attrsOf.nix ./freeform-str-dep-unstr.nix ./define-value-string.nix # Check whether an freeform-typed value can depend on a declared option, this can only work with lazyAttrsOf checkConfigError 'infinite recursion encountered' config.foo ./freeform-attrsOf.nix ./freeform-unstr-dep-str.nix -checkConfigError 'The option .* is used but not defined' config.foo ./freeform-lazyAttrsOf.nix ./freeform-unstr-dep-str.nix +checkConfigError 'The option .* was accessed but has no value defined. Try setting the option.' config.foo ./freeform-lazyAttrsOf.nix ./freeform-unstr-dep-str.nix checkConfigOutput '^"24"$' config.foo ./freeform-lazyAttrsOf.nix ./freeform-unstr-dep-str.nix ./define-value-string.nix # submodules in freeformTypes should have their locations annotated checkConfigOutput '/freeform-submodules.nix"$' config.fooDeclarations.0 ./freeform-submodules.nix @@ -461,8 +461,8 @@ checkConfigOutput "{}" config.attrs.a ./emptyValues.nix checkConfigOutput "null" config.null.a ./emptyValues.nix checkConfigOutput "{}" config.submodule.a ./emptyValues.nix # These types don't have empty values -checkConfigError 'The option .int.a. is used but not defined' config.int.a ./emptyValues.nix -checkConfigError 'The option .nonEmptyList.a. is used but not defined' config.nonEmptyList.a ./emptyValues.nix +checkConfigError 'The option .int.a. was accessed but has no value defined. Try setting the option.' config.int.a ./emptyValues.nix +checkConfigError 'The option .nonEmptyList.a. was accessed but has no value defined. Try setting the option.' config.nonEmptyList.a ./emptyValues.nix # types.unique # requires a single definition diff --git a/pkgs/tools/nix/nixos-option/src/nixos-option.cc b/pkgs/tools/nix/nixos-option/src/nixos-option.cc index eab727bc1db5..658b836d491a 100644 --- a/pkgs/tools/nix/nixos-option/src/nixos-option.cc +++ b/pkgs/tools/nix/nixos-option/src/nixos-option.cc @@ -465,7 +465,7 @@ void printValue(Context & ctx, Out & out, std::variant Date: Sun, 1 Sep 2024 18:55:16 -0700 Subject: [PATCH 26/53] rawtherapee: 5.10 -> 5.11 --- .../graphics/rawtherapee/default.nix | 41 +++++++++++++------ 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index 14c3a0dc7ef2..aa7c9c84ac16 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -1,9 +1,17 @@ { lib , stdenv , fetchFromGitHub -, fetchurl , cmake , pkg-config +, util-linux +, libselinux +, libsepol +, lerc +, libthai +, libdatrie +, libxkbcommon +, libepoxy +, libXtst , wrapGAppsHook3 , makeWrapper , pixman @@ -15,37 +23,31 @@ , libiptcdata , fftw , expat -, pcre +, pcre2 , libsigcxx , lensfun , librsvg , libcanberra-gtk3 , gtk-mac-integration , exiv2 +, libraw + , libjxl }: stdenv.mkDerivation rec { pname = "rawtherapee"; - version = "5.10"; + version = "5.11"; src = fetchFromGitHub { owner = "Beep6581"; repo = "RawTherapee"; rev = version; - hash = "sha256-rIwwKNm7l7oPEt95sHyRj4aF3mtnvM4KAu8oVaIMwyE="; + hash = "sha256-jIAbguwF2aqRTk72ro5oHNTawA7biPSFC41YHgRR730="; # The developpers ask not to use the tarball from Github releases, see # https://www.rawtherapee.com/downloads/5.10/#news-relevant-to-package-maintainers forceFetchGit = true; }; - # https://github.com/Beep6581/RawTherapee/issues/7074 - patches = [ - (fetchurl { - url = "https://github.com/Beep6581/RawTherapee/commit/6b9f45c69c1ddfc3607d3d9c1206dcf1def30295.diff"; - hash = "sha256-3Rti9HV8N1ueUm5B9qxEZL7Lb9bBb+iy2AGKMpJ9YOM="; - }) - ]; - postPatch = '' echo "set(HG_VERSION ${version})" > ReleaseInfo.cmake substituteInPlace tools/osx/Info.plist.in rtgui/config.h.in \ @@ -61,6 +63,15 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + util-linux + libselinux + libsepol + lerc + libthai + libdatrie + libxkbcommon + libepoxy + libXtst pixman libpthreadstubs gtkmm3 @@ -70,11 +81,13 @@ stdenv.mkDerivation rec { libiptcdata fftw expat - pcre + pcre2 libsigcxx lensfun librsvg exiv2 + libraw + libjxl ] ++ lib.optionals stdenv.isLinux [ libcanberra-gtk3 ] ++ lib.optionals stdenv.isDarwin [ @@ -84,6 +97,8 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DPROC_TARGET_NUMBER=2" "-DCACHE_NAME_SUFFIX=\"\"" + "-DWITH_SYSTEM_LIBRAW=\"ON\"" + "-DWITH_JXL=\"ON\"" ] ++ lib.optionals stdenv.isDarwin [ "-DCMAKE_OSX_DEPLOYMENT_TARGET=${stdenv.hostPlatform.darwinMinVersion}" ]; From fce5669ef672949f4b8a2dc9fb583c9ec21dc96d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 2 Sep 2024 02:48:23 +0000 Subject: [PATCH 27/53] lint-staged: 15.2.9 -> 15.2.10 --- pkgs/by-name/li/lint-staged/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/lint-staged/package.nix b/pkgs/by-name/li/lint-staged/package.nix index 4500de64cb68..d802df0f3c60 100644 --- a/pkgs/by-name/li/lint-staged/package.nix +++ b/pkgs/by-name/li/lint-staged/package.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "lint-staged"; - version = "15.2.9"; + version = "15.2.10"; src = fetchFromGitHub { owner = "okonet"; repo = "lint-staged"; rev = "v${version}"; - hash = "sha256-qEqjB6GBzKx4zRqumMPSRxFnWQ4j+sBKWTspaeorL6Q="; + hash = "sha256-Mtr3PXV4pSQgtP+RkPmXpDgmW5hFo7a+xb2GAi+wFg4="; }; - npmDepsHash = "sha256-VQ8UDdPIrhiLvDfpAWLMvCtBIhW/LtRj/CC1j2yEm5o="; + npmDepsHash = "sha256-Br/KlvRkr+jFe8y2KEiE38FYrwgSbY5WpvwVOO4LGuQ="; dontNpmBuild = true; From 83f186230e7f3d91df2a27d6fc944938f9a7813b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 2 Sep 2024 03:20:51 +0000 Subject: [PATCH 28/53] python312Packages.mkdocs-autorefs: 1.1.0 -> 1.2.0 --- pkgs/development/python-modules/mkdocs-autorefs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mkdocs-autorefs/default.nix b/pkgs/development/python-modules/mkdocs-autorefs/default.nix index d5bf6d5e44ff..5fdd6e0f9be8 100644 --- a/pkgs/development/python-modules/mkdocs-autorefs/default.nix +++ b/pkgs/development/python-modules/mkdocs-autorefs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "mkdocs-autorefs"; - version = "1.1.0"; + version = "1.2.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "autorefs"; rev = "refs/tags/${version}"; - hash = "sha256-quN5Ow5mEQ1o5RGYVCcFLrMG9bl51Mg/hrc+VR/SVwM="; + hash = "sha256-C1ca7tx9s88U7Xp/bd3KhlWeb32a612RyCVBQz0vJ1g="; }; postPatch = '' From e27c32ee6d490ab48706021ff9efe1b57c708b3a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 2 Sep 2024 07:56:57 +0200 Subject: [PATCH 29/53] checkov: 3.2.239 -> 3.2.241 Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/3.2.239...3.2.241 Changelog: https://github.com/bridgecrewio/checkov/releases/tag/3.2.241 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 05aa7f736bd3..0080b2c023c3 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.239"; + version = "3.2.241"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-Y746ZwkLS6S682mnMSq30tQgFiZJduEkh3ZeOTf8V1E="; + hash = "sha256-h6Qwpi5wH+kGms2aRgzpshevsY1ry4DPMRD+N56nZbU="; }; patches = [ ./flake8-compat-5.x.patch ]; From 969a8b47fda0d8a6b460af44ac2ce671c9a61026 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 2 Sep 2024 07:58:58 +0200 Subject: [PATCH 30/53] python312Packages.mkdocs-autorefs: refactor --- pkgs/development/python-modules/mkdocs-autorefs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/mkdocs-autorefs/default.nix b/pkgs/development/python-modules/mkdocs-autorefs/default.nix index 5fdd6e0f9be8..a13ab343e6e7 100644 --- a/pkgs/development/python-modules/mkdocs-autorefs/default.nix +++ b/pkgs/development/python-modules/mkdocs-autorefs/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "mkdocs-autorefs"; version = "1.2.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -28,9 +28,9 @@ buildPythonPackage rec { --replace 'dynamic = ["version"]' 'version = "${version}"' ''; - nativeBuildInputs = [ pdm-backend ]; + build-system = [ pdm-backend ]; - propagatedBuildInputs = [ + dependencies = [ markdown mkdocs ]; From f92ec4b4c673ca3077488c9919315b25063b8c07 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 2 Sep 2024 08:01:53 +0200 Subject: [PATCH 31/53] python312Packages.aiolifx: 1.0.8 -> 1.0.9 Changelog: https://github.com/aiolifx/aiolifx/releases/tag/1.0.9 --- pkgs/development/python-modules/aiolifx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiolifx/default.nix b/pkgs/development/python-modules/aiolifx/default.nix index 5811fc2344c7..b593fb67c567 100644 --- a/pkgs/development/python-modules/aiolifx/default.nix +++ b/pkgs/development/python-modules/aiolifx/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "aiolifx"; - version = "1.0.8"; + version = "1.0.9"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-GbChqlBOcrDvzwrY0Vd6TTqPOhUjKbcYtULdQDVsY2o="; + hash = "sha256-x2wzFXehwLZWkRsBv54kYa7aon02saZpBIIA1J+9Fdc="; }; build-system = [ setuptools ]; From 8c62622ea0f371261520a2a602fcaf3529648d23 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 2 Sep 2024 08:06:39 +0200 Subject: [PATCH 32/53] python312Packages.aio-georss-client: 0.12 -> 0.13 Diff: https://github.com/exxamalte/python-aio-georss-client/compare/refs/tags/v0.12...v0.13 Changelog: https://github.com/exxamalte/python-aio-georss-client/blob/v0.13/CHANGELOG.md --- .../python-modules/aio-georss-client/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/aio-georss-client/default.nix b/pkgs/development/python-modules/aio-georss-client/default.nix index 8aea98efa5a4..7bdf88b7654a 100644 --- a/pkgs/development/python-modules/aio-georss-client/default.nix +++ b/pkgs/development/python-modules/aio-georss-client/default.nix @@ -17,23 +17,23 @@ buildPythonPackage rec { pname = "aio-georss-client"; - version = "0.12"; + version = "0.13"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-georss-client"; rev = "refs/tags/v${version}"; - hash = "sha256-qs0/TkGZlwsucnkgCBco2Pqr9mf5fZHY7ikMBKff+gA="; + hash = "sha256-2qo5G/L2yh/6IXswkOyrCYnBNLDLx3EOpR53lnnpNOo="; }; __darwinAllowLocalNetworking = true; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp haversine xmltodict From e57140886732935ea3b237d497a1ebc01f15636e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 2 Sep 2024 08:06:53 +0200 Subject: [PATCH 33/53] python312Packages.aio-georss-gdacs: 0.9 -> 0.10 Diff: https://github.com/exxamalte/python-aio-georss-gdacs/compare/refs/tags/v0.9...v0.10 Changelog: https://github.com/exxamalte/python-aio-georss-gdacs/releases/tag/v0.10 --- .../python-modules/aio-georss-gdacs/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/aio-georss-gdacs/default.nix b/pkgs/development/python-modules/aio-georss-gdacs/default.nix index 457f4bca26ec..c0741c8ff67c 100644 --- a/pkgs/development/python-modules/aio-georss-gdacs/default.nix +++ b/pkgs/development/python-modules/aio-georss-gdacs/default.nix @@ -3,35 +3,35 @@ aio-georss-client, aioresponses, buildPythonPackage, - dateparser, fetchFromGitHub, pytest-asyncio, pytestCheckHook, + python-dateutil, pythonOlder, setuptools, }: buildPythonPackage rec { pname = "aio-georss-gdacs"; - version = "0.9"; + version = "0.10"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-georss-gdacs"; rev = "refs/tags/v${version}"; - hash = "sha256-B0qVCh2u0WleF0iv0o1/d5UIS2kbYCAqCgmNHyCpJ8Q="; + hash = "sha256-PhOI0v3dKTNGZLk1/5wIgvQkm4Cwfr1UYilr5rW7e3g="; }; __darwinAllowLocalNetworking = true; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aio-georss-client - dateparser + python-dateutil ]; nativeCheckInputs = [ From 6c9394a5bc1cea6f2a8ad65097d032ffd20ad250 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 2 Sep 2024 08:09:36 +0200 Subject: [PATCH 34/53] python312Packages.aioairzone-cloud: 0.6.3 -> 0.6.5 Diff: https://github.com/Noltari/aioairzone-cloud/compare/refs/tags/0.6.3...0.6.5 Changelog: https://github.com/Noltari/aioairzone-cloud/releases/tag/0.6.5 --- pkgs/development/python-modules/aioairzone-cloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioairzone-cloud/default.nix b/pkgs/development/python-modules/aioairzone-cloud/default.nix index 6d8e2dad3e8b..06964c3c9cb9 100644 --- a/pkgs/development/python-modules/aioairzone-cloud/default.nix +++ b/pkgs/development/python-modules/aioairzone-cloud/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aioairzone-cloud"; - version = "0.6.3"; + version = "0.6.5"; pyproject = true; disabled = pythonOlder "3.11"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = "aioairzone-cloud"; rev = "refs/tags/${version}"; - hash = "sha256-0F7x/A7kjtFAA6FBZXAD+Ugfkvh5ZfPFoU/emGmogD8="; + hash = "sha256-+F1kcs3XBBRNSmiuobFIFHsZOHEFjwYq0oxkHViuWXw="; }; build-system = [ setuptools ]; From aaf697e9e71fcb56639855d7fbf9a47bad35be60 Mon Sep 17 00:00:00 2001 From: crertel Date: Mon, 2 Sep 2024 01:10:09 -0500 Subject: [PATCH 35/53] lmstudio: 0.3.1 -> 0.3.2 --- pkgs/by-name/lm/lmstudio/darwin.nix | 2 +- pkgs/by-name/lm/lmstudio/linux.nix | 2 +- pkgs/by-name/lm/lmstudio/package.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/lm/lmstudio/darwin.nix b/pkgs/by-name/lm/lmstudio/darwin.nix index 7c4701e5b277..2de26698e6fc 100644 --- a/pkgs/by-name/lm/lmstudio/darwin.nix +++ b/pkgs/by-name/lm/lmstudio/darwin.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://releases.lmstudio.ai/darwin/arm64/${version}/LM%20Studio-${version}-arm64.dmg"; - hash = "sha256-8m+gLZqX1rz8kVxEo880FKvU046juaO2DneeBg7Sc70="; + hash = "sha256-KC4nXhMkrRDRtLPnpD5UTyKzQ+xH9jhZZHnjk9gDVfo="; }; nativeBuildInputs = [ undmg ]; diff --git a/pkgs/by-name/lm/lmstudio/linux.nix b/pkgs/by-name/lm/lmstudio/linux.nix index dafa97ea79e1..c871eed4ee44 100644 --- a/pkgs/by-name/lm/lmstudio/linux.nix +++ b/pkgs/by-name/lm/lmstudio/linux.nix @@ -7,7 +7,7 @@ let src = fetchurl { url = "https://releases.lmstudio.ai/linux/x86/${version}/LM_Studio-${version}.AppImage"; - hash = "sha256-zkTSa0wgKcyKywnIZPF0b6ZzKtyHn3hqjrQPgILF0eI="; + hash = "sha256-w+g7/YezpOr/mBNZbmtLMPt3xTRDIHgGTSroo6mRXxw="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/pkgs/by-name/lm/lmstudio/package.nix b/pkgs/by-name/lm/lmstudio/package.nix index 4e299deb4099..3619f799738e 100644 --- a/pkgs/by-name/lm/lmstudio/package.nix +++ b/pkgs/by-name/lm/lmstudio/package.nix @@ -5,7 +5,7 @@ }: let pname = "lmstudio"; - version = "0.3.1"; + version = "0.3.2"; meta = { description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)"; homepage = "https://lmstudio.ai/"; From 10f75fda649ebbab3d8e7b162ca5711d25afa079 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 2 Sep 2024 08:12:12 +0200 Subject: [PATCH 36/53] python312Packages.aiopulse: 0.4.5 -> 0.4.6 Changelog: https://github.com/atmurray/aiopulse/releases/tag/v0.4.6 --- pkgs/development/python-modules/aiopulse/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/aiopulse/default.nix b/pkgs/development/python-modules/aiopulse/default.nix index 3155e6d7d9ef..7309f774b14f 100644 --- a/pkgs/development/python-modules/aiopulse/default.nix +++ b/pkgs/development/python-modules/aiopulse/default.nix @@ -4,24 +4,24 @@ buildPythonPackage, fetchPypi, pythonOlder, - setuptools, + hatchling, }: buildPythonPackage rec { pname = "aiopulse"; - version = "0.4.5"; + version = "0.4.6"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-yrltqnePNnNwsVGkfXgtrtL/FuazRvmoVL4L0H4j4Bg="; + hash = "sha256-juubQHAAQYN9mSssfF3prYByy+wxscZFxwgspJU8zYA="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ hatchling ]; - propagatedBuildInputs = [ async-timeout ]; + dependencies = [ async-timeout ]; # Tests are not present doCheck = false; From 3f416dd60d69e1c90f16b850195563a70fdd7b63 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 2 Sep 2024 08:17:17 +0200 Subject: [PATCH 37/53] python312Packages.python-telegram-bot: 21.4 -> 21.5 Diff: https://github.com/python-telegram-bot/python-telegram-bot/compare/refs/tags/v21.4...v21.5 Changelog: https://github.com/python-telegram-bot/python-telegram-bot/blob/v21.5/CHANGES.rst --- .../python-telegram-bot/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix index 354c97ffc4e4..5494169e3b12 100644 --- a/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "python-telegram-bot"; - version = "21.4"; + version = "21.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -33,21 +33,25 @@ buildPythonPackage rec { owner = "python-telegram-bot"; repo = "python-telegram-bot"; rev = "refs/tags/v${version}"; - hash = "sha256-5raEejd8WH9JrFvMIy2AuMGK9O/FJ2rq9PeVqK+IMOU="; + hash = "sha256-i1YEcN615xeI4HcygXV9kzuXpT2yDSnlNU6bZqu1dPM="; }; - build-system = [ setuptools hatchling ]; - - dependencies = [ - httpx + build-system = [ + setuptools + hatchling ]; + dependencies = [ httpx ]; + optional-dependencies = rec { all = ext ++ http2 ++ passport ++ socks; callback-data = [ cachetools ]; ext = callback-data ++ job-queue ++ rate-limiter ++ webhooks; http2 = httpx.optional-dependencies.http2; - job-queue = [ apscheduler pytz ]; + job-queue = [ + apscheduler + pytz + ]; passport = [ cryptography ] ++ lib.optionals (pythonAtLeast "3.13") [ cffi ]; rate-limiter = [ aiolimiter ]; socks = httpx.optional-dependencies.socks; From 1881f5679568ea8fa105e90be246307f7baf7f97 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 2 Sep 2024 08:19:50 +0200 Subject: [PATCH 38/53] python312Packages.aioruckus: 0.41 -> 0.41 Diff: https://github.com/ms264556/aioruckus/compare/refs/tags/v0.41...v0.41 --- pkgs/development/python-modules/aioruckus/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioruckus/default.nix b/pkgs/development/python-modules/aioruckus/default.nix index bcd1ce1919fe..95dbb3188d45 100644 --- a/pkgs/development/python-modules/aioruckus/default.nix +++ b/pkgs/development/python-modules/aioruckus/default.nix @@ -1,6 +1,7 @@ { lib, aiohttp, + aioresponses, buildPythonPackage, cryptography, fetchFromGitHub, @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "aioruckus"; - version = "0.40"; + version = "0.41"; pyproject = true; disabled = pythonOlder "3.10"; @@ -22,7 +23,7 @@ buildPythonPackage rec { owner = "ms264556"; repo = "aioruckus"; rev = "refs/tags/v${version}"; - hash = "sha256-oEm0+ktEJHJPg4PUPfSmG9SyVRDrxs7kosQ0tIY+bRc="; + hash = "sha256-acu0EWP/k0qyylPtM8IBxhJhhQhXpbG2NheYpD8RTG8="; }; postPatch = '' @@ -39,6 +40,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + aioresponses pytest-asyncio pytestCheckHook ]; From 5866807db706240e800e2325a56a4453ba6b3045 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 2 Sep 2024 08:23:57 +0200 Subject: [PATCH 39/53] python312Packages.ghapi: refactor --- pkgs/development/python-modules/ghapi/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ghapi/default.nix b/pkgs/development/python-modules/ghapi/default.nix index 9e88007a08c4..feb509d4d87e 100644 --- a/pkgs/development/python-modules/ghapi/default.nix +++ b/pkgs/development/python-modules/ghapi/default.nix @@ -5,12 +5,13 @@ fastcore, packaging, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "ghapi"; version = "1.0.6"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +22,9 @@ buildPythonPackage rec { hash = "sha256-ii19wuFAxMiGce37TNXRNSdvMcGWQjCfPukeqxySYnc="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ fastcore packaging ]; @@ -34,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python interface to GitHub's API"; homepage = "https://github.com/fastai/ghapi"; + changelog = "https://github.com/fastai/ghapi/releases/tag/${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; From e52e1832c9c1e0134621d178b5ff8b236b3819ca Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 2 Sep 2024 08:26:20 +0200 Subject: [PATCH 40/53] python312Packages.coinmetrics-api-client: 2024.8.16.10 -> 2024.8.20.13 --- .../python-modules/coinmetrics-api-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/coinmetrics-api-client/default.nix b/pkgs/development/python-modules/coinmetrics-api-client/default.nix index a15b774d40e3..26272d385cb7 100644 --- a/pkgs/development/python-modules/coinmetrics-api-client/default.nix +++ b/pkgs/development/python-modules/coinmetrics-api-client/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "coinmetrics-api-client"; - version = "2024.8.16.10"; + version = "2024.8.20.13"; pyproject = true; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "coinmetrics_api_client"; - hash = "sha256-HYNmDN3gzmQ7gcUSSXI7/TwDDFPDZJUSu9P0Xz1z2Tk="; + hash = "sha256-IBfHHAmT1BTgA6eMkZf8ggfiknNYp7mfELSRyFARWNk="; }; pythonRelaxDeps = [ "typer" ]; From 5ebc220565b26135a5c0fb98e077725fbdf54d02 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 1 Sep 2024 22:39:05 +0200 Subject: [PATCH 41/53] llvm: add loongarch64 to supported architectures --- pkgs/development/compilers/llvm/common/common-let.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/common/common-let.nix b/pkgs/development/compilers/llvm/common/common-let.nix index 6ee05b80c446..f87af997361c 100644 --- a/pkgs/development/compilers/llvm/common/common-let.nix +++ b/pkgs/development/compilers/llvm/common/common-let.nix @@ -22,7 +22,8 @@ rec { lib.platforms.wasi ++ lib.platforms.x86 ++ lib.optionals (lib.versionAtLeast release_version "7") lib.platforms.riscv ++ - lib.optionals (lib.versionAtLeast release_version "14") lib.platforms.m68k; + lib.optionals (lib.versionAtLeast release_version "14") lib.platforms.m68k ++ + lib.optionals (lib.versionAtLeast release_version "16") lib.platforms.loongarch64; }; releaseInfo = From 2ade30b7af0edc22cc56ea3196b4ab27fa03fb1d Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 9 Jun 2024 16:41:19 +0100 Subject: [PATCH 42/53] rustPlatform.buildRustPackage: merge custom platforms We should constrain the set of supported platforms to the platforms supported by the compiler. Otherwise we run into the unfortunate situation where setting meta.platforms in a Rust package to platforms.unix or platforms.linux will reintroduce CPU architectures unsupported by the compiler. --- .../rust/build-rust-package/default.nix | 31 ++++++++++--------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/pkgs/build-support/rust/build-rust-package/default.nix b/pkgs/build-support/rust/build-rust-package/default.nix index a1727c91ba36..40b7a6181232 100644 --- a/pkgs/build-support/rust/build-rust-package/default.nix +++ b/pkgs/build-support/rust/build-rust-package/default.nix @@ -150,21 +150,24 @@ stdenv.mkDerivation ((removeAttrs args [ "depsExtraArgs" "cargoUpdateHook" "carg strictDeps = true; - meta = { - # default to Rust's platforms - platforms = rustc.meta.platforms ++ [ - # Platforms without host tools from - # https://doc.rust-lang.org/nightly/rustc/platform-support.html - "armv7a-darwin" - "armv5tel-linux" "armv7a-linux" "m68k-linux" "mips-linux" - "mips64-linux" "mipsel-linux" "mips64el-linux" "riscv32-linux" - "armv6l-netbsd" "mipsel-netbsd" "riscv64-netbsd" - "x86_64-redox" - "wasm32-wasi" - ]; - badPlatforms = [ + meta = meta // { + badPlatforms = meta.badPlatforms or [] ++ [ # Rust is currently unable to target the n32 ABI lib.systems.inspect.patterns.isMips64n32 ]; - } // meta; + } // lib.optionalAttrs (rustc.meta ? platforms) { + # default to Rust's platforms + platforms = lib.intersectLists + meta.platforms or lib.platforms.all + (rustc.meta.platforms ++ [ + # Platforms without host tools from + # https://doc.rust-lang.org/nightly/rustc/platform-support.html + "armv7a-darwin" + "armv5tel-linux" "armv7a-linux" "m68k-linux" "mips-linux" + "mips64-linux" "mipsel-linux" "mips64el-linux" "riscv32-linux" + "armv6l-netbsd" "mipsel-netbsd" "riscv64-netbsd" + "x86_64-redox" + "wasm32-wasi" + ]); + }; }) From b5fecd5cfca4e0dca58d0a72ad34ee7a6dbec0d2 Mon Sep 17 00:00:00 2001 From: sanana Date: Sun, 1 Sep 2024 22:09:34 +0300 Subject: [PATCH 43/53] OVMF: fix building for riscv64 --- pkgs/applications/virtualization/OVMF/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index 76d4db7d807c..aba83449423b 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -84,8 +84,8 @@ let in -assert platformSpecific ? ${cpuName}; assert msVarsTemplate -> fdSize4MB; +assert msVarsTemplate -> platformSpecific ? ${cpuName}; assert msVarsTemplate -> platformSpecific.${cpuName} ? msVarsArgs; edk2.mkDerivation projectDscPath (finalAttrs: { From e596e5cc9b9af0c635d765e2cc18435e97915f92 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 2 Sep 2024 09:37:32 +0200 Subject: [PATCH 44/53] mesa: rename enableValgrind back to withValgrind Yes, it's inconsistent with enablePatentEncumberedCodecs, but it's the name this option had before it was removed in dda100f27bcd ("mesa: split out the Darwin build into a separate expression, heavily clean up Linux"), and therefore still has in stable. There's no reason for the name to change between NixOS releases just because it was temporarily removed. --- pkgs/development/libraries/mesa/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 39ed2e004bc2..dc722d44243f 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -40,7 +40,7 @@ , xorg , zstd , enablePatentEncumberedCodecs ? true -, enableValgrind ? lib.meta.availableOn stdenv.hostPlatform valgrind-light +, withValgrind ? lib.meta.availableOn stdenv.hostPlatform valgrind-light , galliumDrivers ? [ "d3d12" # WSL emulated GPU (aka Dozen) @@ -215,7 +215,7 @@ in stdenv.mkDerivation { # meson auto_features enables this, but we do not want it (lib.mesonEnable "android-libbacktrace" false) (lib.mesonEnable "microsoft-clc" false) # Only relevant on Windows (OpenCL 1.2 API on top of D3D12) - (lib.mesonEnable "valgrind" enableValgrind) + (lib.mesonEnable "valgrind" withValgrind) ] ++ lib.optionals enablePatentEncumberedCodecs [ (lib.mesonOption "video-codecs" "all") ] ++ lib.optionals needNativeCLC [ @@ -255,7 +255,7 @@ in stdenv.mkDerivation { xcbutilkeysyms xorgproto zstd - ] ++ lib.optionals enableValgrind [ + ] ++ lib.optionals withValgrind [ valgrind-light ]; From cb74f035008e8dc27fe25f386a62c419cd9c96a5 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 27 Aug 2024 06:10:28 +0200 Subject: [PATCH 45/53] =?UTF-8?q?ocamlPackages.menhir:=2020231231=20?= =?UTF-8?q?=E2=86=92=2020240715?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/menhir/lib.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/menhir/lib.nix b/pkgs/development/ocaml-modules/menhir/lib.nix index a10a1e027733..27af2c1b5200 100644 --- a/pkgs/development/ocaml-modules/menhir/lib.nix +++ b/pkgs/development/ocaml-modules/menhir/lib.nix @@ -1,8 +1,14 @@ -{ lib, buildDunePackage, coqPackages, version ? "20231231" }: +{ lib +, buildDunePackage +, ocaml +, coqPackages +, version ? if lib.versionAtLeast ocaml.version "4.08" then "20240715" else "20231231" +}: let fetched = coqPackages.metaFetch ({ release."20231231".sha256 = "sha256-veB0ORHp6jdRwCyDDAfc7a7ov8sOeHUmiELdOFf/QYk="; - releaseRev = v: "v${v}"; + release."20240715".sha256 = "sha256-9CSxAIm0aEXkwF+aj8u/bqLG30y5eDNz65EnohJPjzI="; + releaseRev = v: "${v}"; location = { domain = "gitlab.inria.fr"; owner = "fpottier"; repo = "menhir"; }; }) version; in From c027f3704aadf0726be4bc558f76cb9c8dda7a51 Mon Sep 17 00:00:00 2001 From: Matteo Pacini Date: Fri, 23 Aug 2024 09:57:15 +0100 Subject: [PATCH 46/53] bwbasic: derivation cleanup --- .../development/interpreters/bwbasic/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/interpreters/bwbasic/default.nix b/pkgs/development/interpreters/bwbasic/default.nix index 4eb5d7dd1312..1507881872a0 100644 --- a/pkgs/development/interpreters/bwbasic/default.nix +++ b/pkgs/development/interpreters/bwbasic/default.nix @@ -1,12 +1,12 @@ { lib, gccStdenv, dos2unix, fetchurl, unzip }: -gccStdenv.mkDerivation rec { +gccStdenv.mkDerivation (finalAttrs: { pname = "bwbasic"; version = "3.20"; src = fetchurl { - url = "mirror://sourceforge/project/bwbasic/bwbasic/version%203.20/bwbasic-3.20.zip"; - sha256 = "1w9r4cl7z1lh52c1jpjragbspi1qn0zb7jhcsldav4gdnzxfw67f"; + url = "mirror://sourceforge/project/bwbasic/bwbasic/version%20${finalAttrs.version}/bwbasic-${finalAttrs.version}.zip"; + hash = "sha256-7hju+rftka0a1QzKsz6wOMSr11NZXhmYKJCGfygjOfE="; }; nativeBuildInputs = [ dos2unix unzip ]; @@ -27,12 +27,12 @@ gccStdenv.mkDerivation rec { mkdir -p $out/bin ''; - meta = with lib; { + meta = { description = "Bywater BASIC Interpreter"; mainProgram = "bwbasic"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ irenes ]; - platforms = platforms.all; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ irenes ]; + platforms = lib.platforms.all; homepage = "https://sourceforge.net/projects/bwbasic/"; }; -} +}) From 5e0698df32f177ddcfb1e9ee6498b48600b7a0b7 Mon Sep 17 00:00:00 2001 From: Matteo Pacini Date: Fri, 23 Aug 2024 09:59:39 +0100 Subject: [PATCH 47/53] bwbasic: format with nixfmt-rfc-style --- pkgs/development/interpreters/bwbasic/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/bwbasic/default.nix b/pkgs/development/interpreters/bwbasic/default.nix index 1507881872a0..7265a5165d9e 100644 --- a/pkgs/development/interpreters/bwbasic/default.nix +++ b/pkgs/development/interpreters/bwbasic/default.nix @@ -1,4 +1,10 @@ -{ lib, gccStdenv, dos2unix, fetchurl, unzip }: +{ + lib, + gccStdenv, + dos2unix, + fetchurl, + unzip, +}: gccStdenv.mkDerivation (finalAttrs: { pname = "bwbasic"; @@ -9,7 +15,10 @@ gccStdenv.mkDerivation (finalAttrs: { hash = "sha256-7hju+rftka0a1QzKsz6wOMSr11NZXhmYKJCGfygjOfE="; }; - nativeBuildInputs = [ dos2unix unzip ]; + nativeBuildInputs = [ + dos2unix + unzip + ]; unpackPhase = '' unzip $src From 79f9ec1033309fde1dba5e5f2fa76448eb4847ee Mon Sep 17 00:00:00 2001 From: sanana Date: Mon, 2 Sep 2024 11:12:24 +0300 Subject: [PATCH 48/53] edk2: add loongarch64 support Upstream had this for some time, let's just enable building it. --- pkgs/by-name/ed/edk2/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ed/edk2/package.nix b/pkgs/by-name/ed/edk2/package.nix index b6946ea11949..0f50c45e6487 100644 --- a/pkgs/by-name/ed/edk2/package.nix +++ b/pkgs/by-name/ed/edk2/package.nix @@ -23,6 +23,8 @@ else if stdenv.isAarch64 then "AARCH64" else if stdenv.hostPlatform.isRiscV64 then "RISCV64" +else if stdenv.hostPlatform.isLoongArch64 then + "LOONGARCH64" else throw "Unsupported architecture"; @@ -128,7 +130,7 @@ edk2 = stdenv.mkDerivation { homepage = "https://github.com/tianocore/tianocore.github.io/wiki/EDK-II/"; changelog = "https://github.com/tianocore/edk2/releases/tag/edk2-stable${edk2.version}"; license = lib.licenses.bsd2; - platforms = with lib.platforms; aarch64 ++ arm ++ i686 ++ x86_64 ++ riscv64; + platforms = with lib.platforms; aarch64 ++ arm ++ i686 ++ x86_64 ++ loongarch64 ++ riscv64; maintainers = [ lib.maintainers.mjoerg ]; }; From 4074fbdc6c28e443295f7f6451ec4223b7fe8703 Mon Sep 17 00:00:00 2001 From: sanana Date: Mon, 2 Sep 2024 11:18:59 +0300 Subject: [PATCH 49/53] OVMF: build for loongarch64 Now that the edk2 package has support for loongarch64, this patch enables building OVMF for loongarch64. --- pkgs/applications/virtualization/OVMF/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index aba83449423b..2c1e49ac2c3d 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -29,6 +29,7 @@ x86_64 = "OvmfPkg/OvmfPkgX64.dsc"; aarch64 = "ArmVirtPkg/ArmVirtQemu.dsc"; riscv64 = "OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc"; + loongarch64 = "OvmfPkg/LoongArchVirt/LoongArchVirtQemu.dsc"; }.${stdenv.hostPlatform.parsed.cpu.name} or (throw "Unsupported OVMF `projectDscPath` on ${stdenv.hostPlatform.parsed.cpu.name}") , fwPrefix ? { @@ -36,6 +37,7 @@ x86_64 = "OVMF"; aarch64 = "AAVMF"; riscv64 = "RISCV_VIRT"; + loongarch64 = "LOONGARCH_VIRT"; }.${stdenv.hostPlatform.parsed.cpu.name} or (throw "Unsupported OVMF `fwPrefix` on ${stdenv.hostPlatform.parsed.cpu.name}") , metaPlatforms ? edk2.meta.platforms @@ -130,17 +132,17 @@ edk2.mkDerivation projectDscPath (finalAttrs: { export PYTHONPATH=$NIX_BUILD_TOP/debian/python:$PYTHONPATH ''; - postBuild = lib.optionalString stdenv.hostPlatform.isAarch '' + postBuild = lib.optionalString (stdenv.hostPlatform.isAarch || stdenv.hostPlatform.isLoongArch64) '' ( cd ${buildPrefix}/FV cp QEMU_EFI.fd ${fwPrefix}_CODE.fd cp QEMU_VARS.fd ${fwPrefix}_VARS.fd - + ) + '' + lib.optionalString stdenv.hostPlatform.isAarch '' # QEMU expects 64MiB CODE and VARS files on ARM/AARCH64 architectures # Truncate the firmware files to the expected size - truncate -s 64M ${fwPrefix}_CODE.fd - truncate -s 64M ${fwPrefix}_VARS.fd - ) + truncate -s 64M ${buildPrefix}/FV/${fwPrefix}_CODE.fd + truncate -s 64M ${buildPrefix}/FV/${fwPrefix}_VARS.fd '' + lib.optionalString stdenv.hostPlatform.isRiscV '' truncate -s 32M ${buildPrefix}/FV/${fwPrefix}_CODE.fd truncate -s 32M ${buildPrefix}/FV/${fwPrefix}_VARS.fd @@ -165,7 +167,7 @@ edk2.mkDerivation projectDscPath (finalAttrs: { postInstall = '' mkdir -vp $fd/FV '' + lib.optionalString (builtins.elem fwPrefix [ - "OVMF" "AAVMF" "RISCV_VIRT" + "OVMF" "AAVMF" "RISCV_VIRT" "LOONGARCH_VIRT" ]) '' mv -v $out/FV/${fwPrefix}_{CODE,VARS}.fd $fd/FV '' + lib.optionalString stdenv.hostPlatform.isx86 '' From a33b796c0217bee669457296a3a0b52d6da479b9 Mon Sep 17 00:00:00 2001 From: Funkeleinhorn Date: Mon, 2 Sep 2024 09:52:13 +0200 Subject: [PATCH 50/53] swaylock-effects: fix pkg-config of wayland-scanner The split out of wayland-scanner from wayland into its own package: https://github.com/NixOS/nixpkgs/commit/921bd99f8de553bd45be0ed298619589f2b7fee4 caused issues with pkg-config not finding wayland-scanner anymore. This commit fixes this by adding pkg-config to depsBuildBuild as done for other packages having the same issues like: https://github.com/NixOS/nixpkgs/commit/ff498279120074a4d9fdbbb7d18f7cebe57a7c9a --- pkgs/by-name/sw/swaylock-effects/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/sw/swaylock-effects/package.nix b/pkgs/by-name/sw/swaylock-effects/package.nix index c5dbf3766f06..aa35229e6efd 100644 --- a/pkgs/by-name/sw/swaylock-effects/package.nix +++ b/pkgs/by-name/sw/swaylock-effects/package.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { ''; strictDeps = true; + depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner]; buildInputs = [ wayland wayland-protocols libxkbcommon cairo gdk-pixbuf pam ]; From 53df1e4ece80dffa673d338a19c541fb1b81cde9 Mon Sep 17 00:00:00 2001 From: phaer Date: Mon, 2 Sep 2024 10:55:54 +0200 Subject: [PATCH 51/53] virtualisation/qemu-vm: disallow nullable diskSize Because `virtualisation.diskSize = null` does result in a broken vm runner, see https://github.com/NixOS/nixpkgs/issues/292901. diskSize was declared to be nullable when it first got types in a tree-wide commit: https://github.com/NixOS/nixpkgs/commit/30f0faac22b6d8a6c6b308a0aa44ee672f2827eb But it seemingly never actually supported it, as "${cfg.diskSize}M" is passed to qemu-img create, which doesn't allow an empty size parameter. closes: https://github.com/NixOS/nixpkgs/issues/292901 --- nixos/modules/virtualisation/qemu-vm.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index a1aed8c4e917..153dc877352a 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -329,7 +329,7 @@ in virtualisation.diskSize = mkOption { - type = types.nullOr types.ints.positive; + type = types.ints.positive; default = 1024; description = '' The disk size in megabytes of the virtual machine. From 31e42275fb83c17c0a5a949b95823caa0b739320 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 2 Sep 2024 01:29:33 +0000 Subject: [PATCH 52/53] beamerpresenter: 0.2.4 -> 0.2.5 --- pkgs/applications/office/beamerpresenter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/beamerpresenter/default.nix b/pkgs/applications/office/beamerpresenter/default.nix index 65fe907c2766..2749f3577c98 100644 --- a/pkgs/applications/office/beamerpresenter/default.nix +++ b/pkgs/applications/office/beamerpresenter/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "beamerpresenter"; - version = "0.2.4"; + version = "0.2.5"; src = fetchFromGitHub { owner = "stiglers-eponym"; repo = "BeamerPresenter"; rev = "v${version}"; - hash = "sha256-UQbyzkFjrIDPcrE6yGuOWsXNjz8jWyJEWiQwHmf91/8="; + hash = "sha256-ofS0KMsn0KG8squIvMPxSCgE/qNK+Kd47psNziLBBoo="; }; nativeBuildInputs = [ From c101f846b3756b7c711f358070f135dbb5b5553f Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 2 Sep 2024 13:55:18 +0300 Subject: [PATCH 53/53] sbclPackages.cl-fam: remove override to fix eval --- pkgs/development/lisp-modules/ql.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/lisp-modules/ql.nix b/pkgs/development/lisp-modules/ql.nix index 595e08dd6a94..91a458c0ef08 100644 --- a/pkgs/development/lisp-modules/ql.nix +++ b/pkgs/development/lisp-modules/ql.nix @@ -250,9 +250,6 @@ let libusb-ffi = super.libusb-ffi.overrideLispAttrs (o: { nativeLibs = [ pkgs.libusb-compat-0_1 ]; }); - cl-fam = super.cl-fam.overrideLispAttrs (o: { - nativeLibs = [ pkgs.fam ]; - }); jpeg-turbo = super.jpeg-turbo.overrideLispAttrs (o: { nativeLibs = [ pkgs.libjpeg_turbo ]; });