From d1c8a07d3ff80376ba2055d77734d9a39abd90d2 Mon Sep 17 00:00:00 2001 From: Andrey Voronkov Date: Fri, 26 Jan 2024 06:56:48 +0300 Subject: [PATCH 001/160] mattermost-desktop 5.5.0 -> 5.6.0 Signed-off-by: Andrey Voronkov --- .../instant-messengers/mattermost-desktop/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix index 56bc542d4206..046c3344b97b 100644 --- a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix @@ -1,24 +1,24 @@ { lib , stdenv , fetchurl -, electron_26 +, electron_28 , makeWrapper }: let pname = "mattermost-desktop"; - version = "5.5.1"; + version = "5.6.0"; srcs = { "x86_64-linux" = { url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-x64.tar.gz"; - hash = "sha256-bRiO5gYM7nrnkbHBP3B9zAK2YV5POkc3stEsbZJ48VA="; + hash = "sha256-KUF/zH18X+RS8AICBv53JTBpcaokzo92psyoQNmLF/Q="; }; "aarch64-linux" = { url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-arm64.tar.gz"; - hash = "sha256-Z4U6Jbwasra69QPHJ9/7WwMSxh0O9r4QIe/xC3WRf4w="; + hash = "sha256-Zl5PalAles39qSMtt1cytfu4Mheud4+8TTkt7Ohdf/o="; }; }; @@ -52,7 +52,7 @@ stdenv.mkDerivation { substituteInPlace $out/share/applications/Mattermost.desktop \ --replace /share/mattermost-desktop/mattermost-desktop /bin/mattermost-desktop - makeWrapper ${electron_26}/bin/electron $out/bin/${pname} \ + makeWrapper ${electron_28}/bin/electron $out/bin/${pname} \ --add-flags $out/share/${pname}/app.asar runHook postInstall From 1f09eb4d9e8d52d56ce3a77e14143af3efc4bdbb Mon Sep 17 00:00:00 2001 From: Kiskae Date: Fri, 2 Feb 2024 20:40:17 +0100 Subject: [PATCH 002/160] electron_*-bin: fix libGL --- pkgs/development/tools/electron/binary/generic.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/electron/binary/generic.nix b/pkgs/development/tools/electron/binary/generic.nix index 8f726b410000..daa0c81d2e05 100644 --- a/pkgs/development/tools/electron/binary/generic.nix +++ b/pkgs/development/tools/electron/binary/generic.nix @@ -12,7 +12,7 @@ , mesa , libxkbcommon , libxshmfence -, libglvnd +, libGL , alsa-lib , cairo , cups @@ -102,7 +102,7 @@ let ++ lib.optionals (lib.versionOlder version "10.0.0") [ libXScrnSaver ] ++ lib.optionals (lib.versionAtLeast version "11.0.0") [ libxkbcommon ] ++ lib.optionals (lib.versionAtLeast version "12.0.0") [ libxshmfence ] - ++ lib.optionals (lib.versionAtLeast version "17.0.0") [ libglvnd ] + ++ lib.optionals (lib.versionAtLeast version "17.0.0") [ libGL ] ); linux = { @@ -130,6 +130,11 @@ let --set-rpath "${electronLibPath}:$out/libexec/electron" \ $out/libexec/electron/.electron-wrapped \ ${lib.optionalString (lib.versionAtLeast version "15.0.0") "$out/libexec/electron/.chrome_crashpad_handler-wrapped" } + + # patch libANGLE + patchelf \ + --set-rpath "${lib.makeLibraryPath [ libGL pciutils ]}" \ + $out/libexec/electron/lib*GL* ''; }; From 6cb1c2d5ac78d9af80606cadf351681d17f6979f Mon Sep 17 00:00:00 2001 From: Andrey Voronkov Date: Sat, 3 Feb 2024 15:31:21 +0300 Subject: [PATCH 003/160] Use same major version of electron which mattermost-desktop uses itself; find electron binary via lib.getExe --- .../instant-messengers/mattermost-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix index 046c3344b97b..7b9246300c06 100644 --- a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchurl -, electron_28 +, electron_27 , makeWrapper }: @@ -52,7 +52,7 @@ stdenv.mkDerivation { substituteInPlace $out/share/applications/Mattermost.desktop \ --replace /share/mattermost-desktop/mattermost-desktop /bin/mattermost-desktop - makeWrapper ${electron_28}/bin/electron $out/bin/${pname} \ + makeWrapper '${lib.getExe electron_27}' $out/bin/${pname} \ --add-flags $out/share/${pname}/app.asar runHook postInstall From e456032addae76701eb17e6c03fc515fd78ad74f Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Wed, 3 Jan 2024 17:41:57 +0100 Subject: [PATCH 004/160] nixos/flake: put nixpkgs in NIX_PATH and system registry for flake configs Currently there are a bunch of really wacky hacks required to get nixpkgs path correctly set up under flake configs such that `nix run nixpkgs#hello` and `nix run -f '' hello` hit the nixpkgs that the system was built with. In particular you have to use specialArgs or an anonymous module, and everyone has to include this hack in their own configs. We can do this for users automatically. I have tested these manually with a basic config; I don't know if it is even possible to write a nixos test for it since you can't really get a string-with-context to yourself unless you are in a flake context. --- flake.nix | 14 ++- .../manual/release-notes/rl-2405.section.md | 8 ++ nixos/modules/misc/nixpkgs-flake.nix | 105 ++++++++++++++++++ nixos/modules/module-list.nix | 1 + 4 files changed, 127 insertions(+), 1 deletion(-) create mode 100644 nixos/modules/misc/nixpkgs-flake.nix diff --git a/flake.nix b/flake.nix index 580f572ff32c..d920d5d0ddda 100644 --- a/flake.nix +++ b/flake.nix @@ -27,7 +27,19 @@ # We set it to null, to remove the "legacy" entrypoint's # non-hermetic default. system = null; - } // args + + modules = args.modules ++ [ + # This module is injected here since it exposes the nixpkgs self-path in as + # constrained of contexts as possible to avoid more things depending on it and + # introducing unnecessary potential fragility to changes in flakes itself. + # + # See: failed attempt to make pkgs.path not copy when using flakes: + # https://github.com/NixOS/nixpkgs/pull/153594#issuecomment-1023287913 + ({ config, pkgs, lib, ... }: { + config.nixpkgs.flake.source = self.outPath; + }) + ]; + } // builtins.removeAttrs args [ "modules" ] ); }); diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index f423311620d9..6a6903f5ce9a 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -14,6 +14,14 @@ In addition to numerous new and upgraded packages, this release has the followin - This can be disabled through the `environment.stub-ld.enable` option. - If you use `programs.nix-ld.enable`, no changes are needed. The stub will be disabled automatically. +- On flake-based NixOS configurations using `nixpkgs.lib.nixosSystem`, NixOS will automatically set `NIX_PATH` and the system-wide flake registry (`/etc/nix/registry.json`) to point `` and the unqualified flake path `nixpkgs` to the version of nixpkgs used to build the system. + + This makes `nix run nixpkgs#hello` and `nix-build '' -A hello` work out of the box with no added configuration, reusing dependencies already on the system. + + This may be undesirable if nix commands are not going to be run on the built system since it adds nixpkgs to the system closure. For such closure-size-constrained non-interactive systems, this setting should be disabled. + + To disable this, set [nixpkgs.flake.setNixPath](#opt-nixpkgs.flake.setNixPath) and [nixpkgs.flake.setFlakeRegistry](#opt-nixpkgs.flake.setFlakeRegistry) to false. + - Julia environments can now be built with arbitrary packages from the ecosystem using the `.withPackages` function. For example: `julia.withPackages ["Plots"]`. ## New Services {#sec-release-24.05-new-services} diff --git a/nixos/modules/misc/nixpkgs-flake.nix b/nixos/modules/misc/nixpkgs-flake.nix new file mode 100644 index 000000000000..8bfe05ca1994 --- /dev/null +++ b/nixos/modules/misc/nixpkgs-flake.nix @@ -0,0 +1,105 @@ +{ config, options, lib, pkgs, ... }: + +with lib; + +let + cfg = config.nixpkgs.flake; +in +{ + options.nixpkgs.flake = { + source = mkOption { + # In newer Nix versions, particularly with lazy trees, outPath of + # flakes becomes a Nix-language path object. We deliberately allow this + # to gracefully come through the interface in discussion with @roberth. + # + # See: https://github.com/NixOS/nixpkgs/pull/278522#discussion_r1460292639 + type = types.nullOr (types.either types.str types.path); + + default = null; + defaultText = "if (using nixpkgsFlake.lib.nixosSystem) then self.outPath else null"; + + example = ''builtins.fetchTarball { name = "source"; sha256 = "${lib.fakeHash}"; url = "https://github.com/nixos/nixpkgs/archive/somecommit.tar.gz"; }''; + + description = mdDoc '' + The path to the nixpkgs sources used to build the system. This is automatically set up to be + the store path of the nixpkgs flake used to build the system if using + `nixpkgs.lib.nixosSystem`, and is otherwise null by default. + + This can also be optionally set if the NixOS system is not built with a flake but still uses + pinned sources: set this to the store path for the nixpkgs sources used to build the system, + as may be obtained by `builtins.fetchTarball`, for example. + + Note: the name of the store path must be "source" due to + . + ''; + }; + + setNixPath = mkOption { + type = types.bool; + + default = cfg.source != null; + defaultText = "config.nixpkgs.flake.source != null"; + + description = mdDoc '' + Whether to set {env}`NIX_PATH` to include `nixpkgs=flake:nixpkgs` such that `` + lookups receive the version of nixpkgs that the system was built with, in concert with + {option}`nixpkgs.flake.setFlakeRegistry`. + + This is on by default for NixOS configurations built with flakes. + + This makes {command}`nix-build '' -A hello` work out of the box on flake systems. + + Note that this option makes the NixOS closure depend on the nixpkgs sources, which may add + undesired closure size if the system will not have any nix commands run on it. + ''; + }; + + setFlakeRegistry = mkOption { + type = types.bool; + + default = cfg.source != null; + defaultText = "config.nixpkgs.flake.source != null"; + + description = mdDoc '' + Whether to pin nixpkgs in the system-wide flake registry (`/etc/nix/registry.json`) to the + store path of the sources of nixpkgs used to build the NixOS system. + + This is on by default for NixOS configurations built with flakes. + + This option makes {command}`nix run nixpkgs#hello` reuse dependencies from the system, avoid + refetching nixpkgs, and have a consistent result every time. + + Note that this option makes the NixOS closure depend on the nixpkgs sources, which may add + undesired closure size if the system will not have any nix commands run on it. + ''; + }; + }; + + config = mkIf (cfg.source != null) (mkMerge [ + { + assertions = [ + { + assertion = cfg.setNixPath -> cfg.setFlakeRegistry; + message = '' + Setting `nixpkgs.flake.setNixPath` requires that `nixpkgs.flake.setFlakeRegistry` also + be set, since it is implemented in terms of indirection through the flake registry. + ''; + } + ]; + } + (mkIf cfg.setFlakeRegistry { + nix.registry.nixpkgs.to = mkDefault { + type = "path"; + path = cfg.source; + }; + }) + (mkIf cfg.setNixPath { + # N.B. This does not include nixos-config in NIX_PATH unlike modules/config/nix-channel.nix + # because we would need some kind of evil shim taking the *calling* flake's self path, + # perhaps, to ever make that work (in order to know where the Nix expr for the system came + # from and how to call it). + nix.nixPath = mkDefault ([ "nixpkgs=flake:nixpkgs" ] + ++ optional config.nix.channel.enable "/nix/var/nix/profiles/per-user/root/channels"); + }) + ]); +} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 65047bdd110a..750dbcc8652a 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -134,6 +134,7 @@ ./misc/meta.nix ./misc/nixops-autoluks.nix ./misc/nixpkgs.nix + ./misc/nixpkgs-flake.nix ./misc/passthru.nix ./misc/version.nix ./misc/wordlist.nix From 67d1d801b048c7200942e99606eb844e46d17329 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Mon, 5 Feb 2024 19:29:39 +0100 Subject: [PATCH 005/160] kcachegrind: fix graphviz missing at runtime --- pkgs/applications/kde/kcachegrind.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/kde/kcachegrind.nix b/pkgs/applications/kde/kcachegrind.nix index 61ff38f31684..3648c1893449 100644 --- a/pkgs/applications/kde/kcachegrind.nix +++ b/pkgs/applications/kde/kcachegrind.nix @@ -2,7 +2,7 @@ mkDerivation, lib, extra-cmake-modules, kdoctools, karchive, ki18n, kio, perl, python3, php, qttools, - kdbusaddons + kdbusaddons, makeBinaryWrapper, graphviz }: mkDerivation { @@ -13,6 +13,10 @@ mkDerivation { license = with lib.licenses; [ gpl2 ]; maintainers = with lib.maintainers; [ orivej ]; }; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeBinaryWrapper ]; buildInputs = [ karchive ki18n kio perl python3 php qttools kdbusaddons ]; + postInstall = '' + wrapProgram $out/bin/kcachegrind \ + --suffix PATH : "${lib.makeBinPath [ graphviz ]}" + ''; } From 89cb7dd94fa6f7b94261e194c48bf14793c8d346 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Reu=C3=9Fe?= Date: Wed, 7 Feb 2024 09:10:26 +0100 Subject: [PATCH 006/160] aws-sam-cli: 1.103.0 -> 1.108.0 --- pkgs/development/tools/aws-sam-cli/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix index 093c5a1ab9e0..45c3e4c62a7a 100644 --- a/pkgs/development/tools/aws-sam-cli/default.nix +++ b/pkgs/development/tools/aws-sam-cli/default.nix @@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication rec { pname = "aws-sam-cli"; - version = "1.103.0"; + version = "1.108.0"; format = "pyproject"; disabled = python3.pythonOlder "3.8"; @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { owner = "aws"; repo = "aws-sam-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-oy0+dAA6x8Jl1nZ1wjsR9xvpR9biemTtqL9B1awz4BM="; + hash = "sha256-k6SXCFkISyfr5/0vhe/Dfzs4qsVfu14lFx/bl53QxR4="; }; nativeBuildInputs = with python3.pkgs; [ @@ -30,6 +30,7 @@ python3.pkgs.buildPythonApplication rec { pythonRelaxDeps = [ "aws-sam-translator" "boto3-stubs" + "cfn-lint" "tzlocal" "cookiecutter" "docker" @@ -92,6 +93,7 @@ python3.pkgs.buildPythonApplication rec { flaky parameterized psutil + pytest-timeout pytest-xdist pytestCheckHook ]; From a77a12229b31f3826c02fd7111cbb4da4a086809 Mon Sep 17 00:00:00 2001 From: Mikael Fangel <34864484+MikaelFangel@users.noreply.github.com> Date: Sat, 6 Jan 2024 19:36:24 +0100 Subject: [PATCH 007/160] changedetection-io: 0.45.9 -> 0.45.13 --- pkgs/servers/web-apps/changedetection-io/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/web-apps/changedetection-io/default.nix b/pkgs/servers/web-apps/changedetection-io/default.nix index a162448e637e..b9156d2e5b7d 100644 --- a/pkgs/servers/web-apps/changedetection-io/default.nix +++ b/pkgs/servers/web-apps/changedetection-io/default.nix @@ -5,19 +5,19 @@ python3.pkgs.buildPythonApplication rec { pname = "changedetection-io"; - version = "0.45.9"; + version = "0.45.14"; format = "setuptools"; src = fetchFromGitHub { owner = "dgtlmoon"; repo = "changedetection.io"; rev = version; - hash = "sha256-xiKXp9DBaiSteqZwQLZ4zLwT5MeETJx01rKRrWGYioc="; + hash = "sha256-O+kWivVc/FZmIDjOE/fsUccrOyHrQ8GakjulEnm4w88="; }; postPatch = '' substituteInPlace requirements.txt \ - --replace "apprise~=1.6.0" "apprise" \ + --replace "apprise~=1.7.1" "apprise" \ --replace "cryptography~=3.4" "cryptography" \ --replace "dnspython~=2.4" "dnspython" \ --replace "pytest ~=7.2" "" \ @@ -47,6 +47,7 @@ python3.pkgs.buildPythonApplication rec { jinja2-time jsonpath-ng jq + loguru lxml paho-mqtt pillow @@ -76,5 +77,6 @@ python3.pkgs.buildPythonApplication rec { changelog = "https://github.com/dgtlmoon/changedetection.io/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ mikaelfangel ]; + mainProgram = "changedetection.io"; }; } From d12a6c07bf8c0988d7c78509014c7ed34a8e4ccb Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Fri, 9 Feb 2024 12:04:50 +0100 Subject: [PATCH 008/160] foomatic-db: unstable-2023-09-02 -> unstable-2024-02-09 Adds "Generic PS Printer" and "Generic PDF Printer". --- pkgs/misc/cups/drivers/foomatic-db/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/cups/drivers/foomatic-db/default.nix b/pkgs/misc/cups/drivers/foomatic-db/default.nix index cb8156b0a0a9..b4be3a143604 100644 --- a/pkgs/misc/cups/drivers/foomatic-db/default.nix +++ b/pkgs/misc/cups/drivers/foomatic-db/default.nix @@ -13,15 +13,15 @@ stdenv.mkDerivation rec { pname = "foomatic-db"; - version = "unstable-2023-09-02"; + version = "unstable-2024-02-09"; src = fetchFromGitHub { # there is also a daily snapshot at the `downloadPage`, # but it gets deleted quickly and would provoke 404 errors owner = "OpenPrinting"; repo = "foomatic-db"; - rev = "4e6ab90da63afddee33d80115acb44149d2d292b"; - hash = "sha256-wtDGJUyViiCenCY4zvr0Ia4ecZpoDsDSWwlYYs3YMT8="; + rev = "f8b43644771612f854fecda969440511de784bf0"; + hash = "sha256-8Pui83Z7g5aHBJk46AYeKil/0++I6zcc5S/BWRuy1WM="; }; buildInputs = [ cups cups-filters ghostscript gnused perl ]; From a5f9ace1e1f6819d78d0ae09062c7c58cc67a6b0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 10 Feb 2024 05:56:29 +0000 Subject: [PATCH 009/160] upscayl: 2.9.8 -> 2.9.9 --- pkgs/applications/graphics/upscayl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/upscayl/default.nix b/pkgs/applications/graphics/upscayl/default.nix index 24b8bc1483b2..6b73a34cd393 100644 --- a/pkgs/applications/graphics/upscayl/default.nix +++ b/pkgs/applications/graphics/upscayl/default.nix @@ -4,11 +4,11 @@ lib, }: let pname = "upscayl"; - version = "2.9.8"; + version = "2.9.9"; src = fetchurl { url = "https://github.com/upscayl/upscayl/releases/download/v${version}/upscayl-${version}-linux.AppImage"; - hash = "sha256-hLK9AX87WbJdKTV/rzEzNeaUWeDz1+bvp/R2LkjHp+w="; + hash = "sha256-33jJRMvRQxL7rPJ6VigEKcDhge46CAA0jJUOhzEyWzA="; }; appimageContents = appimageTools.extractType2 { From 7aa7b440f3666bc5310c1262f8226f238d331f00 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Feb 2024 02:01:33 +0000 Subject: [PATCH 010/160] kool: 3.0.0 -> 3.1.0 --- pkgs/development/tools/misc/kool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/kool/default.nix b/pkgs/development/tools/misc/kool/default.nix index f1d4b2b74654..b5a3c5e77035 100644 --- a/pkgs/development/tools/misc/kool/default.nix +++ b/pkgs/development/tools/misc/kool/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "kool"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "kool-dev"; repo = "kool"; rev = version; - hash = "sha256-+vdizU2/q2nrEanpRPy1scgfTYh/I7feW4jz8efelWY="; + hash = "sha256-apecHILrtvzD1bAOuyhSokDqBB2UgCavQXOw4dQSPwc="; }; vendorHash = "sha256-PmS96KVhe9TDmtYBx2hROLCbGMQ0OY3MN405dUmxPzk="; From f40fcf45170af3fdd83484f923af0db9a45605c4 Mon Sep 17 00:00:00 2001 From: ardishco <109692107+ardishco-the-great@users.noreply.github.com> Date: Fri, 16 Feb 2024 15:10:39 +0300 Subject: [PATCH 011/160] vinegar: add regregrevert patch for wine 9.0 (stable) --- pkgs/by-name/vi/vinegar/package.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/vi/vinegar/package.nix b/pkgs/by-name/vi/vinegar/package.nix index a20b0ff024ee..08a566a7f87f 100644 --- a/pkgs/by-name/vi/vinegar/package.nix +++ b/pkgs/by-name/vi/vinegar/package.nix @@ -8,22 +8,16 @@ , xorg , wayland , vulkan-headers -, wineWowPackages -, fetchpatch +, wine64Packages }: let - # wine-staging doesn't support overrideAttrs for now - wine = wineWowPackages.stagingFull.overrideDerivation (oldAttrs: { + wine = wine64Packages.stable.overrideDerivation (oldAttrs: { patches = (oldAttrs.patches or [ ]) ++ [ # upstream issue: https://bugs.winehq.org/show_bug.cgi?id=55604 # Here are the currently applied patches for Roblox to run under WINE: - (fetchpatch { - name = "vinegar-wine-segrevert.patch"; - url = "https://raw.githubusercontent.com/flathub/org.vinegarhq.Vinegar/8fc153c492542a522d6cc2dff7d1af0e030a529a/patches/wine/temp.patch"; - hash = "sha256-AnEBBhB8leKP0xCSr6UsQK7CN0NDbwqhe326tJ9dDjc="; - }) + ./patches/segregrevert.mypatch ]; }); in From 2e4fb1a50b7dbac41eeaef18d30423302260bee4 Mon Sep 17 00:00:00 2001 From: ardishco-the-great Date: Fri, 16 Feb 2024 15:58:27 +0300 Subject: [PATCH 012/160] vinegar: added segregrevert.mypatch --- .../vi/vinegar/patches/segregrevert.mypatch | 350 ++++++++++++++++++ 1 file changed, 350 insertions(+) create mode 100644 pkgs/by-name/vi/vinegar/patches/segregrevert.mypatch diff --git a/pkgs/by-name/vi/vinegar/patches/segregrevert.mypatch b/pkgs/by-name/vi/vinegar/patches/segregrevert.mypatch new file mode 100644 index 000000000000..09a38e0aff32 --- /dev/null +++ b/pkgs/by-name/vi/vinegar/patches/segregrevert.mypatch @@ -0,0 +1,350 @@ +diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c +index 2f7715a0a60..66cabfd5e64 100644 +--- a/dlls/ntdll/signal_x86_64.c ++++ b/dlls/ntdll/signal_x86_64.c +@@ -559,6 +559,10 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) + context->R12, context->R13, context->R14, context->R15 ); + } + ++ /* Legends of Runeterra depends on having SegDs == SegSs in an exception ++ * handler. */ ++ context->SegDs = context->SegSs; ++ + if (call_vectored_handlers( rec, context ) == EXCEPTION_CONTINUE_EXECUTION) + NtContinue( context, FALSE ); + +diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c +index 3c4d6620fe8..cccd62ae8c0 100644 +--- a/dlls/ntdll/tests/exception.c ++++ b/dlls/ntdll/tests/exception.c +@@ -1825,8 +1825,8 @@ static void test_thread_context(void) + ok( context.SegDs == LOWORD(expect.SegDs), "wrong SegDs %08lx/%08lx\n", context.SegDs, expect.SegDs ); + ok( context.SegEs == LOWORD(expect.SegEs), "wrong SegEs %08lx/%08lx\n", context.SegEs, expect.SegEs ); + ok( context.SegFs == LOWORD(expect.SegFs), "wrong SegFs %08lx/%08lx\n", context.SegFs, expect.SegFs ); +- if (LOWORD(expect.SegGs)) ok( context.SegGs == LOWORD(expect.SegGs), "wrong SegGs %08lx/%08lx\n", context.SegGs, expect.SegGs ); +- ok( context.SegSs == LOWORD(expect.SegSs), "wrong SegSs %08lx/%08lx\n", context.SegSs, expect.SegSs ); ++ ok( context.SegGs == LOWORD(expect.SegGs), "wrong SegGs %08lx/%08lx\n", context.SegGs, expect.SegGs ); ++ ok( context.SegSs == LOWORD(expect.SegSs), "wrong SegSs %08lx/%08lx\n", context.SegSs, expect.SegGs ); + + ok( LOWORD(context.FloatSave.ControlWord) == LOWORD(expect.x87_control), + "wrong x87 control word %#lx/%#lx.\n", context.FloatSave.ControlWord, expect.x87_control ); +@@ -3278,9 +3278,9 @@ static DWORD WINAPI handler( EXCEPTION_RECORD *rec, ULONG64 frame, + ok( context->SegSs == ss, "ss %#x does not match %#x\n", context->SegSs, ss ); + ok( context->SegDs == context->SegSs, + "ds %#x does not match ss %#x\n", context->SegDs, context->SegSs ); +- ok( context->SegEs == context->SegSs, ++ todo_wine ok( context->SegEs == context->SegSs, + "es %#x does not match ss %#x\n", context->SegEs, context->SegSs ); +- ok( context->SegGs == context->SegSs, ++ todo_wine ok( context->SegGs == context->SegSs, + "gs %#x does not match ss %#x\n", context->SegGs, context->SegSs ); + todo_wine ok( context->SegFs && context->SegFs != context->SegSs, + "got fs %#x\n", context->SegFs ); +@@ -3618,12 +3618,13 @@ static void test_exceptions(void) + ok( ctx.SegDs == ds, "wrong ds %04x / %04x\n", ctx.SegDs, ds ); + ok( ctx.SegEs == es, "wrong es %04x / %04x\n", ctx.SegEs, es ); + ok( ctx.SegFs == fs, "wrong fs %04x / %04x\n", ctx.SegFs, fs ); +- ok( ctx.SegGs == gs || !gs, "wrong gs %04x / %04x\n", ctx.SegGs, gs ); ++ ok( ctx.SegGs == gs, "wrong gs %04x / %04x\n", ctx.SegGs, gs ); + ok( ctx.SegSs == ss, "wrong ss %04x / %04x\n", ctx.SegSs, ss ); +- ok( ctx.SegDs == ctx.SegSs, "wrong ds %04x / %04x\n", ctx.SegDs, ctx.SegSs ); +- ok( ctx.SegEs == ctx.SegSs, "wrong es %04x / %04x\n", ctx.SegEs, ctx.SegSs ); ++ todo_wine ok( ctx.SegEs == ctx.SegSs, "wrong es %04x / %04x\n", ctx.SegEs, ctx.SegSs ); + ok( ctx.SegFs != ctx.SegSs, "wrong fs %04x / %04x\n", ctx.SegFs, ctx.SegSs ); +- ok( ctx.SegGs == ctx.SegSs, "wrong gs %04x / %04x\n", ctx.SegGs, ctx.SegSs ); ++ todo_wine ok( ctx.SegGs == ctx.SegSs, "wrong gs %04x / %04x\n", ctx.SegGs, ctx.SegSs ); ++ if (ctx.SegDs == ctx.SegSs) /* FIXME: remove once Wine is fixed */ ++ { + ctx.SegDs = 0; + ctx.SegEs = ctx.SegFs; + ctx.SegFs = ctx.SegSs; +@@ -3639,12 +3640,13 @@ static void test_exceptions(void) + ok( ctx.SegDs == ds, "wrong ds %04x / %04x\n", ctx.SegDs, ds ); + ok( ctx.SegEs == es, "wrong es %04x / %04x\n", ctx.SegEs, es ); + ok( ctx.SegFs == fs, "wrong fs %04x / %04x\n", ctx.SegFs, fs ); +- ok( ctx.SegGs == gs || !gs, "wrong gs %04x / %04x\n", ctx.SegGs, gs ); ++ ok( ctx.SegGs == gs, "wrong gs %04x / %04x\n", ctx.SegGs, gs ); + ok( ctx.SegSs == ss, "wrong ss %04x / %04x\n", ctx.SegSs, ss ); + ok( ctx.SegDs == ctx.SegSs, "wrong ds %04x / %04x\n", ctx.SegDs, ctx.SegSs ); + ok( ctx.SegEs == ctx.SegSs, "wrong es %04x / %04x\n", ctx.SegEs, ctx.SegSs ); + ok( ctx.SegFs != ctx.SegSs, "wrong fs %04x / %04x\n", ctx.SegFs, ctx.SegSs ); +- ok( ctx.SegGs == ctx.SegSs, "wrong gs %04x / %04x\n", ctx.SegGs, ctx.SegSs ); ++ todo_wine ok( ctx.SegGs == ctx.SegSs, "wrong gs %04x / %04x\n", ctx.SegGs, ctx.SegSs ); ++ } + } + + static DWORD WINAPI simd_fault_handler( EXCEPTION_RECORD *rec, ULONG64 frame, +@@ -4403,7 +4405,7 @@ static void test_thread_context(void) + COMPARE( SegDs ); + COMPARE( SegEs ); + COMPARE( SegFs ); +- if (expect.SegGs) COMPARE( SegGs ); ++ COMPARE( SegGs ); + COMPARE( SegSs ); + + /* AMD CPUs don't save the opcode or data pointer if no exception is +diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c +index 53827629af4..526885221b3 100644 +--- a/dlls/ntdll/unix/signal_x86_64.c ++++ b/dlls/ntdll/unix/signal_x86_64.c +@@ -413,16 +413,20 @@ struct syscall_frame + ULONG64 r14; /* 0060 */ + ULONG64 r15; /* 0068 */ + ULONG64 rip; /* 0070 */ +- ULONG64 cs; /* 0078 */ ++ WORD cs; /* 0078 */ ++ WORD ds; /* 007a */ ++ WORD es; /* 007c */ ++ WORD fs; /* 007e */ + ULONG64 eflags; /* 0080 */ + ULONG64 rsp; /* 0088 */ +- ULONG64 ss; /* 0090 */ ++ WORD ss; /* 0090 */ ++ WORD gs; /* 0092 */ ++ DWORD restore_flags; /* 0094 */ + ULONG64 rbp; /* 0098 */ + struct syscall_frame *prev_frame; /* 00a0 */ + void *syscall_cfa; /* 00a8 */ + DWORD syscall_flags; /* 00b0 */ +- DWORD restore_flags; /* 00b4 */ +- DWORD align[2]; /* 00b8 */ ++ DWORD align[3]; /* 00b4 */ + XMM_SAVE_AREA32 xsave; /* 00c0 */ + DECLSPEC_ALIGN(64) XSTATE xstate; /* 02c0 */ + }; +@@ -809,7 +813,17 @@ static inline void set_sigcontext( const CONTEXT *context, ucontext_t *sigcontex + RIP_sig(sigcontext) = context->Rip; + CS_sig(sigcontext) = context->SegCs; + FS_sig(sigcontext) = context->SegFs; ++ GS_sig(sigcontext) = context->SegGs; + EFL_sig(sigcontext) = context->EFlags; ++ #ifdef DS_sig ++ DS_sig(sigcontext) = context->SegDs; ++ #endif ++ #ifdef ES_sig ++ ES_sig(sigcontext) = context->SegEs; ++ #endif ++ #ifdef SS_sig ++ SS_sig(sigcontext) = context->SegSs; ++ #endif + } + + +@@ -838,16 +852,6 @@ static inline void leave_handler( ucontext_t *sigcontext ) + if (fs32_sel && !is_inside_signal_stack( (void *)RSP_sig(sigcontext )) && !is_inside_syscall(sigcontext)) + __asm__ volatile( "movw %0,%%fs" :: "r" (fs32_sel) ); + #endif +-#ifdef DS_sig +- DS_sig(sigcontext) = ds64_sel; +-#else +- __asm__ volatile( "movw %0,%%ds" :: "r" (ds64_sel) ); +-#endif +-#ifdef ES_sig +- ES_sig(sigcontext) = ds64_sel; +-#else +- __asm__ volatile( "movw %0,%%es" :: "r" (ds64_sel) ); +-#endif + } + + +@@ -880,11 +884,23 @@ static void save_context( struct xcontext *xcontext, const ucontext_t *sigcontex + context->Rip = RIP_sig(sigcontext); + context->SegCs = CS_sig(sigcontext); + context->SegFs = FS_sig(sigcontext); ++ context->SegGs = GS_sig(sigcontext); + context->EFlags = EFL_sig(sigcontext); +- context->SegDs = ds64_sel; +- context->SegEs = ds64_sel; +- context->SegGs = ds64_sel; +- context->SegSs = ds64_sel; ++ #ifdef DS_sig ++ context->SegDs = DS_sig(sigcontext); ++ #else ++ __asm__("movw %%ds,%0" : "=m" (context->SegDs)); ++ #endif ++ #ifdef ES_sig ++ context->SegEs = ES_sig(sigcontext); ++ #else ++ __asm__("movw %%es,%0" : "=m" (context->SegEs)); ++ #endif ++ #ifdef SS_sig ++ context->SegSs = SS_sig(sigcontext); ++ #else ++ __asm__("movw %%ss,%0" : "=m" (context->SegSs)); ++ #endif + context->Dr0 = amd64_thread_data()->dr0; + context->Dr1 = amd64_thread_data()->dr1; + context->Dr2 = amd64_thread_data()->dr2; +@@ -1041,6 +1057,15 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) + frame->rbp = context->Rbp; + frame->rip = context->Rip; + frame->eflags = context->EFlags; ++ frame->cs = context->SegCs; ++ frame->ss = context->SegSs; ++ } ++ if (flags & CONTEXT_SEGMENTS) ++ { ++ frame->ds = context->SegDs; ++ frame->es = context->SegEs; ++ frame->fs = context->SegFs; ++ frame->gs = context->SegGs; + } + if (flags & CONTEXT_FLOATING_POINT) + { +@@ -1108,16 +1133,16 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) + context->Rbp = frame->rbp; + context->Rip = frame->rip; + context->EFlags = frame->eflags; +- context->SegCs = cs64_sel; +- context->SegSs = ds64_sel; ++ context->SegCs = frame->cs; ++ context->SegSs = frame->ss; + context->ContextFlags |= CONTEXT_CONTROL; + } + if (needed_flags & CONTEXT_SEGMENTS) + { +- context->SegDs = ds64_sel; +- context->SegEs = ds64_sel; +- context->SegFs = amd64_thread_data()->fs; +- context->SegGs = ds64_sel; ++ context->SegDs = frame->ds; ++ context->SegEs = frame->es; ++ context->SegFs = frame->fs; ++ context->SegGs = frame->gs; + context->ContextFlags |= CONTEXT_SEGMENTS; + } + if (needed_flags & CONTEXT_FLOATING_POINT) +@@ -1345,16 +1370,16 @@ NTSTATUS get_thread_wow64_context( HANDLE handle, void *ctx, ULONG size ) + context->Ebp = wow_frame->Ebp; + context->Eip = wow_frame->Eip; + context->EFlags = wow_frame->EFlags; +- context->SegCs = cs32_sel; +- context->SegSs = ds64_sel; ++ context->SegCs = wow_frame->SegCs; ++ context->SegSs = wow_frame->SegSs; + context->ContextFlags |= CONTEXT_I386_CONTROL; + } + if (needed_flags & CONTEXT_I386_SEGMENTS) + { +- context->SegDs = ds64_sel; +- context->SegEs = ds64_sel; +- context->SegFs = amd64_thread_data()->fs; +- context->SegGs = ds64_sel; ++ context->SegDs = wow_frame->SegDs; ++ context->SegEs = wow_frame->SegEs; ++ context->SegFs = wow_frame->SegFs; ++ context->SegGs = wow_frame->SegGs; + context->ContextFlags |= CONTEXT_I386_SEGMENTS; + } + if (needed_flags & CONTEXT_I386_EXTENDED_REGISTERS) +@@ -2523,11 +2548,11 @@ void call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend, TEB + wow_context->Esp = get_wow_teb( teb )->Tib.StackBase - 16; + wow_context->Eip = pLdrSystemDllInitBlock->pRtlUserThreadStart; + wow_context->SegCs = cs32_sel; +- wow_context->SegDs = ds64_sel; +- wow_context->SegEs = ds64_sel; +- wow_context->SegFs = thread_data->fs; +- wow_context->SegGs = ds64_sel; +- wow_context->SegSs = ds64_sel; ++ wow_context->SegDs = context.SegDs; ++ wow_context->SegEs = context.SegEs; ++ wow_context->SegFs = context.SegFs; ++ wow_context->SegGs = context.SegGs; ++ wow_context->SegSs = context.SegSs; + wow_context->EFlags = 0x202; + wow_context->FloatSave.ControlWord = context.FltSave.ControlWord; + *(XSAVE_FORMAT *)wow_context->ExtendedRegisters = context.FltSave; +@@ -2541,8 +2566,6 @@ void call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend, TEB + memset( frame, 0, sizeof(*frame) ); + NtSetContextThread( GetCurrentThread(), ctx ); + +- frame->cs = cs64_sel; +- frame->ss = ds64_sel; + frame->rsp = (ULONG64)ctx - 8; + frame->rip = (ULONG64)pLdrInitializeThunk; + frame->rcx = (ULONG64)ctx; +@@ -2606,7 +2629,7 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, + __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") + "popq 0x80(%rcx)\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset -8\n\t") +- "movl $0,0xb4(%rcx)\n\t" /* frame->restore_flags */ ++ "movl $0,0x94(%rcx)\n\t" /* frame->restore_flags */ + __ASM_LOCAL_LABEL("__wine_syscall_dispatcher_prolog_end") ":\n\t" + "movq %rax,0x00(%rcx)\n\t" + "movq %rbx,0x08(%rcx)\n\t" +@@ -2625,9 +2648,13 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, + "movq %r15,0x68(%rcx)\n\t" + __ASM_CFI_REG_IS_AT2(r15, rcx, 0xe8, 0x00) + "movw %cs,0x78(%rcx)\n\t" ++ "movw %ds,0x7a(%rcx)\n\t" ++ "movw %es,0x7c(%rcx)\n\t" ++ "movw %fs,0x7e(%rcx)\n\t" + "movq %rsp,0x88(%rcx)\n\t" + __ASM_CFI_CFA_IS_AT2(rcx, 0x88, 0x01) + "movw %ss,0x90(%rcx)\n\t" ++ "movw %gs,0x92(%rcx)\n\t" + "movq %rbp,0x98(%rcx)\n\t" + __ASM_CFI_REG_IS_AT2(rbp, rcx, 0x98, 0x01) + /* Legends of Runeterra hooks the first system call return instruction, and +@@ -2732,7 +2759,7 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, + "callq *(%r10,%rax,8)\n\t" + "leaq -0x98(%rbp),%rcx\n\t" + __ASM_LOCAL_LABEL("__wine_syscall_dispatcher_return") ":\n\t" +- "movl 0xb4(%rcx),%edx\n\t" /* frame->restore_flags */ ++ "movl 0x94(%rcx),%edx\n\t" /* frame->restore_flags */ + "testl $0x48,%edx\n\t" /* CONTEXT_FLOATING_POINT | CONTEXT_XSTATE */ + "jnz 2f\n\t" + "movaps 0x1c0(%rcx),%xmm6\n\t" +@@ -2753,7 +2780,7 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, + "xorl %edx,%edx\n\t" + "xrstor64 0xc0(%rcx)\n\t" + "movq %r11,%rax\n\t" +- "movl 0xb4(%rcx),%edx\n\t" /* frame->restore_flags */ ++ "movl 0x94(%rcx),%edx\n\t" + "jmp 4f\n" + "3:\tfxrstor64 0xc0(%rcx)\n" + "4:\tmovq 0x98(%rcx),%rbp\n\t" +@@ -2771,7 +2798,7 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, + #ifdef __linux__ + "testl $12,%r14d\n\t" /* SYSCALL_HAVE_PTHREAD_TEB | SYSCALL_HAVE_WRFSGSBASE */ + "jz 1f\n\t" +- "movw %gs:0x338,%fs\n" /* amd64_thread_data()->fs */ ++ "movw 0x7e(%rcx),%fs\n" + "1:\n\t" + #endif + "movq 0x60(%rcx),%r14\n\t" +@@ -2844,7 +2871,7 @@ __ASM_GLOBAL_FUNC( __wine_unix_call_dispatcher, + "popq 0x70(%rcx)\n\t" /* frame->rip */ + __ASM_CFI(".cfi_adjust_cfa_offset -8\n\t") + __ASM_CFI_REG_IS_AT2(rip, rcx, 0xf0,0x00) +- "movl $0,0xb4(%rcx)\n\t" /* frame->restore_flags */ ++ "movl $0,0x94(%rcx)\n\t" /* frame->restore_flags */ + __ASM_LOCAL_LABEL("__wine_unix_call_dispatcher_prolog_end") ":\n\t" + "movq %rbx,0x08(%rcx)\n\t" + __ASM_CFI_REG_IS_AT1(rbx, rcx, 0x08) +@@ -2892,6 +2919,7 @@ __ASM_GLOBAL_FUNC( __wine_unix_call_dispatcher, + #ifdef __linux__ + "testl $12,%r14d\n\t" /* SYSCALL_HAVE_PTHREAD_TEB | SYSCALL_HAVE_WRFSGSBASE */ + "jz 2f\n\t" ++ "movw %fs,0x7e(%rcx)\n\t" + "movq %gs:0x320,%rsi\n\t" /* amd64_thread_data()->pthread_teb */ + "testl $8,%r14d\n\t" /* SYSCALL_HAVE_WRFSGSBASE */ + "jz 1f\n\t" +@@ -2915,7 +2943,7 @@ __ASM_GLOBAL_FUNC( __wine_unix_call_dispatcher, + "movdqa 0x230(%rcx),%xmm13\n\t" + "movdqa 0x240(%rcx),%xmm14\n\t" + "movdqa 0x250(%rcx),%xmm15\n\t" +- "testl $0xffff,0xb4(%rcx)\n\t" /* frame->restore_flags */ ++ "testl $0xffff,0x94(%rcx)\n\t" /* frame->restore_flags */ + "jnz " __ASM_LOCAL_LABEL("__wine_syscall_dispatcher_return") "\n\t" + /* switch to user stack */ + "movq 0x88(%rcx),%rsp\n\t" +@@ -2923,7 +2951,7 @@ __ASM_GLOBAL_FUNC( __wine_unix_call_dispatcher, + #ifdef __linux__ + "testl $12,%r14d\n\t" /* SYSCALL_HAVE_PTHREAD_TEB | SYSCALL_HAVE_WRFSGSBASE */ + "jz 1f\n\t" +- "movw %gs:0x338,%fs\n" /* amd64_thread_data()->fs */ ++ "movw 0x7e(%rcx),%fs\n" + "1:\n\t" + #endif + "movq 0x60(%rcx),%r14\n\t" From e603deafb8a56c1e92e7e307e0b7a0632d0857f1 Mon Sep 17 00:00:00 2001 From: Raroh73 <96078496+Raroh73@users.noreply.github.com> Date: Fri, 16 Feb 2024 15:02:51 +0100 Subject: [PATCH 013/160] maintainers: add raroh73 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1ebc30f27d44..05043887a421 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15876,6 +15876,12 @@ githubId = 11351304; name = "Ricardo Ardissone"; }; + raroh73 = { + email = "me@raroh73.com"; + github = "Raroh73"; + githubId = 96078496; + name = "Raroh73"; + }; rasendubi = { email = "rasen.dubi@gmail.com"; github = "rasendubi"; From e4bbd31362607962e5d83dbac70fd7738c3330ca Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Feb 2024 15:03:31 +0000 Subject: [PATCH 014/160] kubetail: 1.6.18 -> 1.6.19 --- pkgs/applications/networking/cluster/kubetail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubetail/default.nix b/pkgs/applications/networking/cluster/kubetail/default.nix index c7858cf994d3..3053a59ae7d4 100644 --- a/pkgs/applications/networking/cluster/kubetail/default.nix +++ b/pkgs/applications/networking/cluster/kubetail/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kubetail"; - version = "1.6.18"; + version = "1.6.19"; src = fetchFromGitHub { owner = "johanhaleby"; repo = "kubetail"; rev = version; - sha256 = "sha256-Gde5thEpMX3h0e1eoC8SeDdkZfa02CmQf3ELLMeEWGU="; + sha256 = "sha256-s+rz30VWG4RijeJuRYEhCmgFDjaxJ+4twgXrGkNc5c8="; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; From 93f6cd522ae1fc7793d94ef21c4c3e5c5f4eb2d8 Mon Sep 17 00:00:00 2001 From: ardishco-the-great Date: Fri, 16 Feb 2024 18:43:37 +0300 Subject: [PATCH 015/160] vinegar: switched Wine version to wine64Packages.staging, added segregrevert patch, added mouselock patch, added wine-loader-prefer-winedllpath.patch, bumped vinegar version from 1.6.1 --> 1.7.3 and removed patches folder --- pkgs/by-name/vi/vinegar/package.nix | 27 +- .../vi/vinegar/patches/segregrevert.mypatch | 350 ------------------ 2 files changed, 21 insertions(+), 356 deletions(-) delete mode 100644 pkgs/by-name/vi/vinegar/patches/segregrevert.mypatch diff --git a/pkgs/by-name/vi/vinegar/package.nix b/pkgs/by-name/vi/vinegar/package.nix index 08a566a7f87f..1740c3aa9d08 100644 --- a/pkgs/by-name/vi/vinegar/package.nix +++ b/pkgs/by-name/vi/vinegar/package.nix @@ -9,30 +9,45 @@ , wayland , vulkan-headers , wine64Packages +, fetchpatch }: let - wine = wine64Packages.stable.overrideDerivation (oldAttrs: { + wine = wine64Packages.staging.overrideDerivation (oldAttrs: { patches = - (oldAttrs.patches or [ ]) + (oldAttrs.patches or []) ++ [ # upstream issue: https://bugs.winehq.org/show_bug.cgi?id=55604 # Here are the currently applied patches for Roblox to run under WINE: - ./patches/segregrevert.mypatch + (fetchpatch { + name = "vinegar-wine-segregrevert.patch"; + url = "https://raw.githubusercontent.com/flathub/org.vinegarhq.Vinegar/e24cb9dfa996bcfeaa46504c0375660fe271148d/patches/wine/segregrevert.patch"; + hash = "sha256-+3Nld81nG3GufI4jAF6yrWfkJmsSCOku39rx0Hov29c="; + }) + (fetchpatch { + name = "vinegar-wine-mouselock.patch"; + url = "https://raw.githubusercontent.com/flathub/org.vinegarhq.Vinegar/e24cb9dfa996bcfeaa46504c0375660fe271148d/patches/wine/mouselock.patch"; + hash = "sha256-0AGA4AQbxTL5BGVbm072moav7xVA3zpotYqM8pcEDa4="; + }) + (fetchpatch { + name = "vinegar-wine-loader-prefer-winedllpath.patch"; + url = "https://raw.githubusercontent.com/flathub/org.vinegarhq.Vinegar/e24cb9dfa996bcfeaa46504c0375660fe271148d/patches/wine/loader-prefer-winedllpath.patch"; + hash = "sha256-KscGMMSmjnQEBjNSHECw9VCX2H6z7fKxrqxEfElGwJQ="; + }) ]; }); in buildGoModule rec { pname = "vinegar"; - version = "1.6.1"; + version = "1.7.3"; src = fetchFromGitHub { owner = "vinegarhq"; repo = "vinegar"; rev = "v${version}"; - hash = "sha256-uRdWE5NwRVSuUZyU5B5u5DfJOxu/gUqwM682eORTDOs="; + hash = "sha256-aKL+4jw/uMbbvLRCBHstCTrcQ1PTYSCwMNgXTvSvMeY="; }; - vendorHash = "sha256-Ex6PRd3rD2jbLXlY36koNvZF3P+gAZTE9hExIfOw9CE="; + vendorHash = "sha256-OaMfWecOPQh6quXjYkZLyBDHZ9TINSA7Ue/Y0sz5ZYY="; nativeBuildInputs = [ pkg-config makeBinaryWrapper ]; buildInputs = [ libGL libxkbcommon xorg.libX11 xorg.libXcursor xorg.libXfixes wayland vulkan-headers wine ]; diff --git a/pkgs/by-name/vi/vinegar/patches/segregrevert.mypatch b/pkgs/by-name/vi/vinegar/patches/segregrevert.mypatch deleted file mode 100644 index 09a38e0aff32..000000000000 --- a/pkgs/by-name/vi/vinegar/patches/segregrevert.mypatch +++ /dev/null @@ -1,350 +0,0 @@ -diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c -index 2f7715a0a60..66cabfd5e64 100644 ---- a/dlls/ntdll/signal_x86_64.c -+++ b/dlls/ntdll/signal_x86_64.c -@@ -559,6 +559,10 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) - context->R12, context->R13, context->R14, context->R15 ); - } - -+ /* Legends of Runeterra depends on having SegDs == SegSs in an exception -+ * handler. */ -+ context->SegDs = context->SegSs; -+ - if (call_vectored_handlers( rec, context ) == EXCEPTION_CONTINUE_EXECUTION) - NtContinue( context, FALSE ); - -diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c -index 3c4d6620fe8..cccd62ae8c0 100644 ---- a/dlls/ntdll/tests/exception.c -+++ b/dlls/ntdll/tests/exception.c -@@ -1825,8 +1825,8 @@ static void test_thread_context(void) - ok( context.SegDs == LOWORD(expect.SegDs), "wrong SegDs %08lx/%08lx\n", context.SegDs, expect.SegDs ); - ok( context.SegEs == LOWORD(expect.SegEs), "wrong SegEs %08lx/%08lx\n", context.SegEs, expect.SegEs ); - ok( context.SegFs == LOWORD(expect.SegFs), "wrong SegFs %08lx/%08lx\n", context.SegFs, expect.SegFs ); -- if (LOWORD(expect.SegGs)) ok( context.SegGs == LOWORD(expect.SegGs), "wrong SegGs %08lx/%08lx\n", context.SegGs, expect.SegGs ); -- ok( context.SegSs == LOWORD(expect.SegSs), "wrong SegSs %08lx/%08lx\n", context.SegSs, expect.SegSs ); -+ ok( context.SegGs == LOWORD(expect.SegGs), "wrong SegGs %08lx/%08lx\n", context.SegGs, expect.SegGs ); -+ ok( context.SegSs == LOWORD(expect.SegSs), "wrong SegSs %08lx/%08lx\n", context.SegSs, expect.SegGs ); - - ok( LOWORD(context.FloatSave.ControlWord) == LOWORD(expect.x87_control), - "wrong x87 control word %#lx/%#lx.\n", context.FloatSave.ControlWord, expect.x87_control ); -@@ -3278,9 +3278,9 @@ static DWORD WINAPI handler( EXCEPTION_RECORD *rec, ULONG64 frame, - ok( context->SegSs == ss, "ss %#x does not match %#x\n", context->SegSs, ss ); - ok( context->SegDs == context->SegSs, - "ds %#x does not match ss %#x\n", context->SegDs, context->SegSs ); -- ok( context->SegEs == context->SegSs, -+ todo_wine ok( context->SegEs == context->SegSs, - "es %#x does not match ss %#x\n", context->SegEs, context->SegSs ); -- ok( context->SegGs == context->SegSs, -+ todo_wine ok( context->SegGs == context->SegSs, - "gs %#x does not match ss %#x\n", context->SegGs, context->SegSs ); - todo_wine ok( context->SegFs && context->SegFs != context->SegSs, - "got fs %#x\n", context->SegFs ); -@@ -3618,12 +3618,13 @@ static void test_exceptions(void) - ok( ctx.SegDs == ds, "wrong ds %04x / %04x\n", ctx.SegDs, ds ); - ok( ctx.SegEs == es, "wrong es %04x / %04x\n", ctx.SegEs, es ); - ok( ctx.SegFs == fs, "wrong fs %04x / %04x\n", ctx.SegFs, fs ); -- ok( ctx.SegGs == gs || !gs, "wrong gs %04x / %04x\n", ctx.SegGs, gs ); -+ ok( ctx.SegGs == gs, "wrong gs %04x / %04x\n", ctx.SegGs, gs ); - ok( ctx.SegSs == ss, "wrong ss %04x / %04x\n", ctx.SegSs, ss ); -- ok( ctx.SegDs == ctx.SegSs, "wrong ds %04x / %04x\n", ctx.SegDs, ctx.SegSs ); -- ok( ctx.SegEs == ctx.SegSs, "wrong es %04x / %04x\n", ctx.SegEs, ctx.SegSs ); -+ todo_wine ok( ctx.SegEs == ctx.SegSs, "wrong es %04x / %04x\n", ctx.SegEs, ctx.SegSs ); - ok( ctx.SegFs != ctx.SegSs, "wrong fs %04x / %04x\n", ctx.SegFs, ctx.SegSs ); -- ok( ctx.SegGs == ctx.SegSs, "wrong gs %04x / %04x\n", ctx.SegGs, ctx.SegSs ); -+ todo_wine ok( ctx.SegGs == ctx.SegSs, "wrong gs %04x / %04x\n", ctx.SegGs, ctx.SegSs ); -+ if (ctx.SegDs == ctx.SegSs) /* FIXME: remove once Wine is fixed */ -+ { - ctx.SegDs = 0; - ctx.SegEs = ctx.SegFs; - ctx.SegFs = ctx.SegSs; -@@ -3639,12 +3640,13 @@ static void test_exceptions(void) - ok( ctx.SegDs == ds, "wrong ds %04x / %04x\n", ctx.SegDs, ds ); - ok( ctx.SegEs == es, "wrong es %04x / %04x\n", ctx.SegEs, es ); - ok( ctx.SegFs == fs, "wrong fs %04x / %04x\n", ctx.SegFs, fs ); -- ok( ctx.SegGs == gs || !gs, "wrong gs %04x / %04x\n", ctx.SegGs, gs ); -+ ok( ctx.SegGs == gs, "wrong gs %04x / %04x\n", ctx.SegGs, gs ); - ok( ctx.SegSs == ss, "wrong ss %04x / %04x\n", ctx.SegSs, ss ); - ok( ctx.SegDs == ctx.SegSs, "wrong ds %04x / %04x\n", ctx.SegDs, ctx.SegSs ); - ok( ctx.SegEs == ctx.SegSs, "wrong es %04x / %04x\n", ctx.SegEs, ctx.SegSs ); - ok( ctx.SegFs != ctx.SegSs, "wrong fs %04x / %04x\n", ctx.SegFs, ctx.SegSs ); -- ok( ctx.SegGs == ctx.SegSs, "wrong gs %04x / %04x\n", ctx.SegGs, ctx.SegSs ); -+ todo_wine ok( ctx.SegGs == ctx.SegSs, "wrong gs %04x / %04x\n", ctx.SegGs, ctx.SegSs ); -+ } - } - - static DWORD WINAPI simd_fault_handler( EXCEPTION_RECORD *rec, ULONG64 frame, -@@ -4403,7 +4405,7 @@ static void test_thread_context(void) - COMPARE( SegDs ); - COMPARE( SegEs ); - COMPARE( SegFs ); -- if (expect.SegGs) COMPARE( SegGs ); -+ COMPARE( SegGs ); - COMPARE( SegSs ); - - /* AMD CPUs don't save the opcode or data pointer if no exception is -diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c -index 53827629af4..526885221b3 100644 ---- a/dlls/ntdll/unix/signal_x86_64.c -+++ b/dlls/ntdll/unix/signal_x86_64.c -@@ -413,16 +413,20 @@ struct syscall_frame - ULONG64 r14; /* 0060 */ - ULONG64 r15; /* 0068 */ - ULONG64 rip; /* 0070 */ -- ULONG64 cs; /* 0078 */ -+ WORD cs; /* 0078 */ -+ WORD ds; /* 007a */ -+ WORD es; /* 007c */ -+ WORD fs; /* 007e */ - ULONG64 eflags; /* 0080 */ - ULONG64 rsp; /* 0088 */ -- ULONG64 ss; /* 0090 */ -+ WORD ss; /* 0090 */ -+ WORD gs; /* 0092 */ -+ DWORD restore_flags; /* 0094 */ - ULONG64 rbp; /* 0098 */ - struct syscall_frame *prev_frame; /* 00a0 */ - void *syscall_cfa; /* 00a8 */ - DWORD syscall_flags; /* 00b0 */ -- DWORD restore_flags; /* 00b4 */ -- DWORD align[2]; /* 00b8 */ -+ DWORD align[3]; /* 00b4 */ - XMM_SAVE_AREA32 xsave; /* 00c0 */ - DECLSPEC_ALIGN(64) XSTATE xstate; /* 02c0 */ - }; -@@ -809,7 +813,17 @@ static inline void set_sigcontext( const CONTEXT *context, ucontext_t *sigcontex - RIP_sig(sigcontext) = context->Rip; - CS_sig(sigcontext) = context->SegCs; - FS_sig(sigcontext) = context->SegFs; -+ GS_sig(sigcontext) = context->SegGs; - EFL_sig(sigcontext) = context->EFlags; -+ #ifdef DS_sig -+ DS_sig(sigcontext) = context->SegDs; -+ #endif -+ #ifdef ES_sig -+ ES_sig(sigcontext) = context->SegEs; -+ #endif -+ #ifdef SS_sig -+ SS_sig(sigcontext) = context->SegSs; -+ #endif - } - - -@@ -838,16 +852,6 @@ static inline void leave_handler( ucontext_t *sigcontext ) - if (fs32_sel && !is_inside_signal_stack( (void *)RSP_sig(sigcontext )) && !is_inside_syscall(sigcontext)) - __asm__ volatile( "movw %0,%%fs" :: "r" (fs32_sel) ); - #endif --#ifdef DS_sig -- DS_sig(sigcontext) = ds64_sel; --#else -- __asm__ volatile( "movw %0,%%ds" :: "r" (ds64_sel) ); --#endif --#ifdef ES_sig -- ES_sig(sigcontext) = ds64_sel; --#else -- __asm__ volatile( "movw %0,%%es" :: "r" (ds64_sel) ); --#endif - } - - -@@ -880,11 +884,23 @@ static void save_context( struct xcontext *xcontext, const ucontext_t *sigcontex - context->Rip = RIP_sig(sigcontext); - context->SegCs = CS_sig(sigcontext); - context->SegFs = FS_sig(sigcontext); -+ context->SegGs = GS_sig(sigcontext); - context->EFlags = EFL_sig(sigcontext); -- context->SegDs = ds64_sel; -- context->SegEs = ds64_sel; -- context->SegGs = ds64_sel; -- context->SegSs = ds64_sel; -+ #ifdef DS_sig -+ context->SegDs = DS_sig(sigcontext); -+ #else -+ __asm__("movw %%ds,%0" : "=m" (context->SegDs)); -+ #endif -+ #ifdef ES_sig -+ context->SegEs = ES_sig(sigcontext); -+ #else -+ __asm__("movw %%es,%0" : "=m" (context->SegEs)); -+ #endif -+ #ifdef SS_sig -+ context->SegSs = SS_sig(sigcontext); -+ #else -+ __asm__("movw %%ss,%0" : "=m" (context->SegSs)); -+ #endif - context->Dr0 = amd64_thread_data()->dr0; - context->Dr1 = amd64_thread_data()->dr1; - context->Dr2 = amd64_thread_data()->dr2; -@@ -1041,6 +1057,15 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) - frame->rbp = context->Rbp; - frame->rip = context->Rip; - frame->eflags = context->EFlags; -+ frame->cs = context->SegCs; -+ frame->ss = context->SegSs; -+ } -+ if (flags & CONTEXT_SEGMENTS) -+ { -+ frame->ds = context->SegDs; -+ frame->es = context->SegEs; -+ frame->fs = context->SegFs; -+ frame->gs = context->SegGs; - } - if (flags & CONTEXT_FLOATING_POINT) - { -@@ -1108,16 +1133,16 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) - context->Rbp = frame->rbp; - context->Rip = frame->rip; - context->EFlags = frame->eflags; -- context->SegCs = cs64_sel; -- context->SegSs = ds64_sel; -+ context->SegCs = frame->cs; -+ context->SegSs = frame->ss; - context->ContextFlags |= CONTEXT_CONTROL; - } - if (needed_flags & CONTEXT_SEGMENTS) - { -- context->SegDs = ds64_sel; -- context->SegEs = ds64_sel; -- context->SegFs = amd64_thread_data()->fs; -- context->SegGs = ds64_sel; -+ context->SegDs = frame->ds; -+ context->SegEs = frame->es; -+ context->SegFs = frame->fs; -+ context->SegGs = frame->gs; - context->ContextFlags |= CONTEXT_SEGMENTS; - } - if (needed_flags & CONTEXT_FLOATING_POINT) -@@ -1345,16 +1370,16 @@ NTSTATUS get_thread_wow64_context( HANDLE handle, void *ctx, ULONG size ) - context->Ebp = wow_frame->Ebp; - context->Eip = wow_frame->Eip; - context->EFlags = wow_frame->EFlags; -- context->SegCs = cs32_sel; -- context->SegSs = ds64_sel; -+ context->SegCs = wow_frame->SegCs; -+ context->SegSs = wow_frame->SegSs; - context->ContextFlags |= CONTEXT_I386_CONTROL; - } - if (needed_flags & CONTEXT_I386_SEGMENTS) - { -- context->SegDs = ds64_sel; -- context->SegEs = ds64_sel; -- context->SegFs = amd64_thread_data()->fs; -- context->SegGs = ds64_sel; -+ context->SegDs = wow_frame->SegDs; -+ context->SegEs = wow_frame->SegEs; -+ context->SegFs = wow_frame->SegFs; -+ context->SegGs = wow_frame->SegGs; - context->ContextFlags |= CONTEXT_I386_SEGMENTS; - } - if (needed_flags & CONTEXT_I386_EXTENDED_REGISTERS) -@@ -2523,11 +2548,11 @@ void call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend, TEB - wow_context->Esp = get_wow_teb( teb )->Tib.StackBase - 16; - wow_context->Eip = pLdrSystemDllInitBlock->pRtlUserThreadStart; - wow_context->SegCs = cs32_sel; -- wow_context->SegDs = ds64_sel; -- wow_context->SegEs = ds64_sel; -- wow_context->SegFs = thread_data->fs; -- wow_context->SegGs = ds64_sel; -- wow_context->SegSs = ds64_sel; -+ wow_context->SegDs = context.SegDs; -+ wow_context->SegEs = context.SegEs; -+ wow_context->SegFs = context.SegFs; -+ wow_context->SegGs = context.SegGs; -+ wow_context->SegSs = context.SegSs; - wow_context->EFlags = 0x202; - wow_context->FloatSave.ControlWord = context.FltSave.ControlWord; - *(XSAVE_FORMAT *)wow_context->ExtendedRegisters = context.FltSave; -@@ -2541,8 +2566,6 @@ void call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend, TEB - memset( frame, 0, sizeof(*frame) ); - NtSetContextThread( GetCurrentThread(), ctx ); - -- frame->cs = cs64_sel; -- frame->ss = ds64_sel; - frame->rsp = (ULONG64)ctx - 8; - frame->rip = (ULONG64)pLdrInitializeThunk; - frame->rcx = (ULONG64)ctx; -@@ -2606,7 +2629,7 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, - __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") - "popq 0x80(%rcx)\n\t" - __ASM_CFI(".cfi_adjust_cfa_offset -8\n\t") -- "movl $0,0xb4(%rcx)\n\t" /* frame->restore_flags */ -+ "movl $0,0x94(%rcx)\n\t" /* frame->restore_flags */ - __ASM_LOCAL_LABEL("__wine_syscall_dispatcher_prolog_end") ":\n\t" - "movq %rax,0x00(%rcx)\n\t" - "movq %rbx,0x08(%rcx)\n\t" -@@ -2625,9 +2648,13 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, - "movq %r15,0x68(%rcx)\n\t" - __ASM_CFI_REG_IS_AT2(r15, rcx, 0xe8, 0x00) - "movw %cs,0x78(%rcx)\n\t" -+ "movw %ds,0x7a(%rcx)\n\t" -+ "movw %es,0x7c(%rcx)\n\t" -+ "movw %fs,0x7e(%rcx)\n\t" - "movq %rsp,0x88(%rcx)\n\t" - __ASM_CFI_CFA_IS_AT2(rcx, 0x88, 0x01) - "movw %ss,0x90(%rcx)\n\t" -+ "movw %gs,0x92(%rcx)\n\t" - "movq %rbp,0x98(%rcx)\n\t" - __ASM_CFI_REG_IS_AT2(rbp, rcx, 0x98, 0x01) - /* Legends of Runeterra hooks the first system call return instruction, and -@@ -2732,7 +2759,7 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, - "callq *(%r10,%rax,8)\n\t" - "leaq -0x98(%rbp),%rcx\n\t" - __ASM_LOCAL_LABEL("__wine_syscall_dispatcher_return") ":\n\t" -- "movl 0xb4(%rcx),%edx\n\t" /* frame->restore_flags */ -+ "movl 0x94(%rcx),%edx\n\t" /* frame->restore_flags */ - "testl $0x48,%edx\n\t" /* CONTEXT_FLOATING_POINT | CONTEXT_XSTATE */ - "jnz 2f\n\t" - "movaps 0x1c0(%rcx),%xmm6\n\t" -@@ -2753,7 +2780,7 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, - "xorl %edx,%edx\n\t" - "xrstor64 0xc0(%rcx)\n\t" - "movq %r11,%rax\n\t" -- "movl 0xb4(%rcx),%edx\n\t" /* frame->restore_flags */ -+ "movl 0x94(%rcx),%edx\n\t" - "jmp 4f\n" - "3:\tfxrstor64 0xc0(%rcx)\n" - "4:\tmovq 0x98(%rcx),%rbp\n\t" -@@ -2771,7 +2798,7 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, - #ifdef __linux__ - "testl $12,%r14d\n\t" /* SYSCALL_HAVE_PTHREAD_TEB | SYSCALL_HAVE_WRFSGSBASE */ - "jz 1f\n\t" -- "movw %gs:0x338,%fs\n" /* amd64_thread_data()->fs */ -+ "movw 0x7e(%rcx),%fs\n" - "1:\n\t" - #endif - "movq 0x60(%rcx),%r14\n\t" -@@ -2844,7 +2871,7 @@ __ASM_GLOBAL_FUNC( __wine_unix_call_dispatcher, - "popq 0x70(%rcx)\n\t" /* frame->rip */ - __ASM_CFI(".cfi_adjust_cfa_offset -8\n\t") - __ASM_CFI_REG_IS_AT2(rip, rcx, 0xf0,0x00) -- "movl $0,0xb4(%rcx)\n\t" /* frame->restore_flags */ -+ "movl $0,0x94(%rcx)\n\t" /* frame->restore_flags */ - __ASM_LOCAL_LABEL("__wine_unix_call_dispatcher_prolog_end") ":\n\t" - "movq %rbx,0x08(%rcx)\n\t" - __ASM_CFI_REG_IS_AT1(rbx, rcx, 0x08) -@@ -2892,6 +2919,7 @@ __ASM_GLOBAL_FUNC( __wine_unix_call_dispatcher, - #ifdef __linux__ - "testl $12,%r14d\n\t" /* SYSCALL_HAVE_PTHREAD_TEB | SYSCALL_HAVE_WRFSGSBASE */ - "jz 2f\n\t" -+ "movw %fs,0x7e(%rcx)\n\t" - "movq %gs:0x320,%rsi\n\t" /* amd64_thread_data()->pthread_teb */ - "testl $8,%r14d\n\t" /* SYSCALL_HAVE_WRFSGSBASE */ - "jz 1f\n\t" -@@ -2915,7 +2943,7 @@ __ASM_GLOBAL_FUNC( __wine_unix_call_dispatcher, - "movdqa 0x230(%rcx),%xmm13\n\t" - "movdqa 0x240(%rcx),%xmm14\n\t" - "movdqa 0x250(%rcx),%xmm15\n\t" -- "testl $0xffff,0xb4(%rcx)\n\t" /* frame->restore_flags */ -+ "testl $0xffff,0x94(%rcx)\n\t" /* frame->restore_flags */ - "jnz " __ASM_LOCAL_LABEL("__wine_syscall_dispatcher_return") "\n\t" - /* switch to user stack */ - "movq 0x88(%rcx),%rsp\n\t" -@@ -2923,7 +2951,7 @@ __ASM_GLOBAL_FUNC( __wine_unix_call_dispatcher, - #ifdef __linux__ - "testl $12,%r14d\n\t" /* SYSCALL_HAVE_PTHREAD_TEB | SYSCALL_HAVE_WRFSGSBASE */ - "jz 1f\n\t" -- "movw %gs:0x338,%fs\n" /* amd64_thread_data()->fs */ -+ "movw 0x7e(%rcx),%fs\n" - "1:\n\t" - #endif - "movq 0x60(%rcx),%r14\n\t" From d08413cc170b8a848b38732ca0b9678c6894fff2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Feb 2024 17:11:38 +0000 Subject: [PATCH 016/160] python311Packages.pex: 2.1.162 -> 2.2.1 --- pkgs/development/python-modules/pex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index a5c5ff601bcd..dd00edd5b0e1 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.162"; + version = "2.2.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XeAOEhmNEACr+KrIYaclDH7EW2XQeobIAQvm99hn24M="; + hash = "sha256-I63eX9BDn9RGitEFZiulsjEYVAsmYyvSNi3+2tIrGv8="; }; nativeBuildInputs = [ From 5a810307b2ffab6120f1583d29a6ec449dea2dcd Mon Sep 17 00:00:00 2001 From: ardishco-the-great Date: Sun, 18 Feb 2024 02:24:50 +0300 Subject: [PATCH 017/160] vinegar: removed wine-loader-prefer-winedllpatch.patch --- pkgs/by-name/vi/vinegar/package.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/by-name/vi/vinegar/package.nix b/pkgs/by-name/vi/vinegar/package.nix index 1740c3aa9d08..9873d6b5d187 100644 --- a/pkgs/by-name/vi/vinegar/package.nix +++ b/pkgs/by-name/vi/vinegar/package.nix @@ -28,11 +28,6 @@ let url = "https://raw.githubusercontent.com/flathub/org.vinegarhq.Vinegar/e24cb9dfa996bcfeaa46504c0375660fe271148d/patches/wine/mouselock.patch"; hash = "sha256-0AGA4AQbxTL5BGVbm072moav7xVA3zpotYqM8pcEDa4="; }) - (fetchpatch { - name = "vinegar-wine-loader-prefer-winedllpath.patch"; - url = "https://raw.githubusercontent.com/flathub/org.vinegarhq.Vinegar/e24cb9dfa996bcfeaa46504c0375660fe271148d/patches/wine/loader-prefer-winedllpath.patch"; - hash = "sha256-KscGMMSmjnQEBjNSHECw9VCX2H6z7fKxrqxEfElGwJQ="; - }) ]; }); in From fd3fa9f2d3d3729582dfcd5ea56a066a488c3e11 Mon Sep 17 00:00:00 2001 From: budimanjojo Date: Mon, 19 Feb 2024 10:38:26 +0700 Subject: [PATCH 018/160] nixos/oci-containers: check if image exists locally before failing Signed-off-by: budimanjojo --- nixos/modules/virtualisation/oci-containers.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/oci-containers.nix b/nixos/modules/virtualisation/oci-containers.nix index b6a7b1154c4a..a88715587d65 100644 --- a/nixos/modules/virtualisation/oci-containers.nix +++ b/nixos/modules/virtualisation/oci-containers.nix @@ -252,10 +252,13 @@ let text = '' ${cfg.backend} rm -f ${name} || true ${optionalString (isValidLogin container.login) '' + # try logging in, if it fails, check if image exists locally ${cfg.backend} login \ ${container.login.registry} \ --username ${container.login.username} \ - --password-stdin < ${container.login.passwordFile} + --password-stdin < ${container.login.passwordFile} \ + || ${cfg.backend} image inspect ${container.image} >/dev/null \ + || { echo "image doesn't exist locally and login failed" >&2 ; exit 1; } ''} ${optionalString (container.imageFile != null) '' ${cfg.backend} load -i ${container.imageFile} From 258b935d705be03e939b8205215202ad202073b3 Mon Sep 17 00:00:00 2001 From: pennae Date: Sun, 18 Feb 2024 23:35:17 +0100 Subject: [PATCH 019/160] nixos/filesystems: make supportedFilesystems an attrset this lets us *dis*able filesystem explicitly, as is required by e.g. the zfs-less installer images. currently that specifically is only easily possible by adding an overlay that stubs out `zfs`, with the obvious side-effect of also removing tooling that could run without the kernel module loaded. --- .../manual/release-notes/rl-2405.section.md | 2 ++ ...tallation-cd-minimal-new-kernel-no-zfs.nix | 12 ++--------- ...ge-aarch64-new-kernel-no-zfs-installer.nix | 12 ++--------- nixos/modules/system/boot/stage-1.nix | 8 +++---- nixos/modules/tasks/filesystems.nix | 21 +++++++++++++++---- nixos/modules/tasks/filesystems/apfs.nix | 4 ++-- nixos/modules/tasks/filesystems/bcachefs.nix | 4 ++-- nixos/modules/tasks/filesystems/btrfs.nix | 4 ++-- nixos/modules/tasks/filesystems/cifs.nix | 4 ++-- nixos/modules/tasks/filesystems/ecryptfs.nix | 2 +- nixos/modules/tasks/filesystems/erofs.nix | 4 ++-- nixos/modules/tasks/filesystems/exfat.nix | 2 +- nixos/modules/tasks/filesystems/ext.nix | 6 ++++-- nixos/modules/tasks/filesystems/f2fs.nix | 5 ++--- nixos/modules/tasks/filesystems/glusterfs.nix | 2 +- nixos/modules/tasks/filesystems/jfs.nix | 4 ++-- nixos/modules/tasks/filesystems/nfs.nix | 4 ++-- nixos/modules/tasks/filesystems/ntfs.nix | 2 +- nixos/modules/tasks/filesystems/reiserfs.nix | 4 ++-- nixos/modules/tasks/filesystems/squashfs.nix | 2 +- nixos/modules/tasks/filesystems/sshfs.nix | 10 ++++++--- .../tasks/filesystems/unionfs-fuse.nix | 4 ++-- nixos/modules/tasks/filesystems/vboxsf.nix | 4 ++-- nixos/modules/tasks/filesystems/vfat.nix | 4 ++-- nixos/modules/tasks/filesystems/xfs.nix | 4 ++-- nixos/modules/tasks/filesystems/zfs.nix | 4 ++-- nixos/modules/virtualisation/cri-o.nix | 2 +- .../modules/virtualisation/podman/default.nix | 2 +- nixos/tests/installer.nix | 3 +-- 29 files changed, 73 insertions(+), 72 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index 74563bf44344..9fc8053e8dec 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -105,6 +105,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - `nitter` requires a `guest_accounts.jsonl` to be provided as a path or loaded into the default location at `/var/lib/nitter/guest_accounts.jsonl`. See [Guest Account Branch Deployment](https://github.com/zedeus/nitter/wiki/Guest-Account-Branch-Deployment) for details. +- `boot.supportedFilesystems` and `boot.initrd.supportedFilesystems` are now attribute sets instead of lists. Assignment from lists as done previously is still supported, but checking whether a filesystem is enabled must now by done using `supportedFilesystems.fs or false` instead of using `lib.elem "fs" supportedFilesystems` as was done previously. + - `services.aria2.rpcSecret` has been replaced with `services.aria2.rpcSecretFile`. This was done so that secrets aren't stored in the world-readable nix store. To migrate, you will have create a file with the same exact string, and change diff --git a/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel-no-zfs.nix b/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel-no-zfs.nix index 9d09cdbe0206..fc3cb08bdbbb 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel-no-zfs.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel-no-zfs.nix @@ -1,15 +1,7 @@ -{ pkgs, ... }: +{ lib, ... }: { imports = [ ./installation-cd-minimal-new-kernel.nix ]; - # Makes `availableOn` fail for zfs, see . - # This is a workaround since we cannot remove the `"zfs"` string from `supportedFilesystems`. - # The proper fix would be to make `supportedFilesystems` an attrset with true/false which we - # could then `lib.mkForce false` - nixpkgs.overlays = [(final: super: { - zfs = super.zfs.overrideAttrs(_: { - meta.platforms = []; - }); - })]; + boot.supportedFilesystems.zfs = lib.mkForce false; } diff --git a/nixos/modules/installer/sd-card/sd-image-aarch64-new-kernel-no-zfs-installer.nix b/nixos/modules/installer/sd-card/sd-image-aarch64-new-kernel-no-zfs-installer.nix index 0e5055960294..da5410057887 100644 --- a/nixos/modules/installer/sd-card/sd-image-aarch64-new-kernel-no-zfs-installer.nix +++ b/nixos/modules/installer/sd-card/sd-image-aarch64-new-kernel-no-zfs-installer.nix @@ -1,15 +1,7 @@ -{ pkgs, ... }: +{ lib, ... }: { imports = [ ./sd-image-aarch64-new-kernel-installer.nix ]; - # Makes `availableOn` fail for zfs, see . - # This is a workaround since we cannot remove the `"zfs"` string from `supportedFilesystems`. - # The proper fix would be to make `supportedFilesystems` an attrset with true/false which we - # could then `lib.mkForce false` - nixpkgs.overlays = [(final: super: { - zfs = super.zfs.overrideAttrs(_: { - meta.platforms = []; - }); - })]; + boot.supportedFilesystems.zfs = lib.mkForce false; } diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 8f3f3612805f..90a74c0ac578 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -3,7 +3,7 @@ # the modules necessary to mount the root file system, then calls the # init in the root file system to start the second boot stage. -{ config, lib, utils, pkgs, ... }: +{ config, options, lib, utils, pkgs, ... }: with lib; @@ -636,10 +636,8 @@ in }; boot.initrd.supportedFilesystems = mkOption { - default = [ ]; - example = [ "btrfs" ]; - type = types.listOf types.str; - description = lib.mdDoc "Names of supported filesystem types in the initial ramdisk."; + default = { }; + inherit (options.boot.supportedFilesystems) example type description; }; boot.initrd.verbose = mkOption { diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index 1378a0090c1d..e72a1e37759e 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -246,10 +246,23 @@ in }; boot.supportedFilesystems = mkOption { - default = [ ]; - example = [ "btrfs" ]; - type = types.listOf types.str; - description = lib.mdDoc "Names of supported filesystem types."; + default = { }; + example = lib.literalExpression '' + { + btrfs = true; + zfs = lib.mkForce false; + } + ''; + type = types.coercedTo + (types.listOf types.str) + (enabled: lib.listToAttrs (map (fs: lib.nameValuePair fs true) enabled)) + (types.attrsOf types.bool); + description = lib.mdDoc '' + Names of supported filesystem types, or an attribute set of file system types + and their state. The set form may be used together with `lib.mkForce` to + explicitly disable support for specific filesystems, e.g. to disable ZFS + with an unsupported kernel. + ''; }; boot.specialFileSystems = mkOption { diff --git a/nixos/modules/tasks/filesystems/apfs.nix b/nixos/modules/tasks/filesystems/apfs.nix index 2f2be351df61..980a3ad0f9c4 100644 --- a/nixos/modules/tasks/filesystems/apfs.nix +++ b/nixos/modules/tasks/filesystems/apfs.nix @@ -4,12 +4,12 @@ with lib; let - inInitrd = any (fs: fs == "apfs") config.boot.initrd.supportedFilesystems; + inInitrd = config.boot.initrd.supportedFilesystems.apfs or false; in { - config = mkIf (any (fs: fs == "apfs") config.boot.supportedFilesystems) { + config = mkIf (config.boot.supportedFilesystems.apfs or false) { system.fsPackages = [ pkgs.apfsprogs ]; diff --git a/nixos/modules/tasks/filesystems/bcachefs.nix b/nixos/modules/tasks/filesystems/bcachefs.nix index 3b990ce30b21..ba33edd702f7 100644 --- a/nixos/modules/tasks/filesystems/bcachefs.nix +++ b/nixos/modules/tasks/filesystems/bcachefs.nix @@ -118,7 +118,7 @@ let in { - config = lib.mkIf (lib.elem "bcachefs" config.boot.supportedFilesystems) (lib.mkMerge [ + config = lib.mkIf (config.boot.supportedFilesystems.bcachefs or false) (lib.mkMerge [ { inherit assertions; # needed for systemd-remount-fs @@ -133,7 +133,7 @@ in }; } - (lib.mkIf ((lib.elem "bcachefs" config.boot.initrd.supportedFilesystems) || (bootFs != {})) { + (lib.mkIf ((config.boot.initrd.supportedFilesystems.bcachefs or false) || (bootFs != {})) { inherit assertions; # chacha20 and poly1305 are required only for decryption attempts boot.initrd.availableKernelModules = [ "bcachefs" "sha256" "chacha20" "poly1305" ]; diff --git a/nixos/modules/tasks/filesystems/btrfs.nix b/nixos/modules/tasks/filesystems/btrfs.nix index 87fe326c0974..8494a06f97a2 100644 --- a/nixos/modules/tasks/filesystems/btrfs.nix +++ b/nixos/modules/tasks/filesystems/btrfs.nix @@ -4,8 +4,8 @@ with lib; let - inInitrd = any (fs: fs == "btrfs") config.boot.initrd.supportedFilesystems; - inSystem = any (fs: fs == "btrfs") config.boot.supportedFilesystems; + inInitrd = config.boot.initrd.supportedFilesystems.btrfs or false; + inSystem = config.boot.supportedFilesystems.btrfs or false; cfgScrub = config.services.btrfs.autoScrub; diff --git a/nixos/modules/tasks/filesystems/cifs.nix b/nixos/modules/tasks/filesystems/cifs.nix index 837b9e19bfb9..5a562b2940f7 100644 --- a/nixos/modules/tasks/filesystems/cifs.nix +++ b/nixos/modules/tasks/filesystems/cifs.nix @@ -4,14 +4,14 @@ with lib; let - inInitrd = any (fs: fs == "cifs") config.boot.initrd.supportedFilesystems; + inInitrd = config.boot.initrd.supportedFilesystems.cifs or false; in { config = { - system.fsPackages = mkIf (any (fs: fs == "cifs") config.boot.supportedFilesystems) [ pkgs.cifs-utils ]; + system.fsPackages = mkIf (config.boot.supportedFilesystems.cifs or false) [ pkgs.cifs-utils ]; boot.initrd.availableKernelModules = mkIf inInitrd [ "cifs" "nls_utf8" "hmac" "md4" "ecb" "des_generic" "sha256" ]; diff --git a/nixos/modules/tasks/filesystems/ecryptfs.nix b/nixos/modules/tasks/filesystems/ecryptfs.nix index 8138e6591610..f966a1be1536 100644 --- a/nixos/modules/tasks/filesystems/ecryptfs.nix +++ b/nixos/modules/tasks/filesystems/ecryptfs.nix @@ -4,7 +4,7 @@ with lib; { - config = mkIf (any (fs: fs == "ecryptfs") config.boot.supportedFilesystems) { + config = mkIf (config.boot.supportedFilesystems.ecryptfs or false) { system.fsPackages = [ pkgs.ecryptfs ]; security.wrappers = { "mount.ecryptfs_private" = diff --git a/nixos/modules/tasks/filesystems/erofs.nix b/nixos/modules/tasks/filesystems/erofs.nix index a3d657669350..b13fa2531557 100644 --- a/nixos/modules/tasks/filesystems/erofs.nix +++ b/nixos/modules/tasks/filesystems/erofs.nix @@ -2,8 +2,8 @@ let - inInitrd = lib.any (fs: fs == "erofs") config.boot.initrd.supportedFilesystems; - inSystem = lib.any (fs: fs == "erofs") config.boot.supportedFilesystems; + inInitrd = config.boot.initrd.supportedFilesystems.erofs or false; + inSystem = config.boot.supportedFilesystems.erofs or false; in diff --git a/nixos/modules/tasks/filesystems/exfat.nix b/nixos/modules/tasks/filesystems/exfat.nix index 540b9b91c3ec..4011653c00df 100644 --- a/nixos/modules/tasks/filesystems/exfat.nix +++ b/nixos/modules/tasks/filesystems/exfat.nix @@ -3,7 +3,7 @@ with lib; { - config = mkIf (any (fs: fs == "exfat") config.boot.supportedFilesystems) { + config = mkIf (config.boot.supportedFilesystems.exfat or false) { system.fsPackages = if config.boot.kernelPackages.kernelOlder "5.7" then [ pkgs.exfat # FUSE ] else [ diff --git a/nixos/modules/tasks/filesystems/ext.nix b/nixos/modules/tasks/filesystems/ext.nix index 1c34ee2c7035..165fe9474c3e 100644 --- a/nixos/modules/tasks/filesystems/ext.nix +++ b/nixos/modules/tasks/filesystems/ext.nix @@ -2,8 +2,10 @@ let - inInitrd = lib.any (fs: fs == "ext2" || fs == "ext3" || fs == "ext4") config.boot.initrd.supportedFilesystems; - inSystem = lib.any (fs: fs == "ext2" || fs == "ext3" || fs == "ext4") config.boot.supportedFilesystems; + hasExtX = s: s.ext2 or s.ext3 or s.ext4 or false; + + inInitrd = hasExtX config.boot.initrd.supportedFilesystems; + inSystem = hasExtX config.boot.supportedFilesystems; in diff --git a/nixos/modules/tasks/filesystems/f2fs.nix b/nixos/modules/tasks/filesystems/f2fs.nix index 4f99f9a57fa6..f4f5fcab9cae 100644 --- a/nixos/modules/tasks/filesystems/f2fs.nix +++ b/nixos/modules/tasks/filesystems/f2fs.nix @@ -3,11 +3,10 @@ with lib; let - inInitrd = any (fs: fs == "f2fs") config.boot.initrd.supportedFilesystems; - fileSystems = filter (x: x.fsType == "f2fs") config.system.build.fileSystems; + inInitrd = config.boot.initrd.supportedFilesystems.f2fs or false; in { - config = mkIf (any (fs: fs == "f2fs") config.boot.supportedFilesystems) { + config = mkIf (config.boot.supportedFilesystems.f2fs or false) { system.fsPackages = [ pkgs.f2fs-tools ]; diff --git a/nixos/modules/tasks/filesystems/glusterfs.nix b/nixos/modules/tasks/filesystems/glusterfs.nix index e8c7fa8efbae..02ef95262dbd 100644 --- a/nixos/modules/tasks/filesystems/glusterfs.nix +++ b/nixos/modules/tasks/filesystems/glusterfs.nix @@ -3,7 +3,7 @@ with lib; { - config = mkIf (any (fs: fs == "glusterfs") config.boot.supportedFilesystems) { + config = mkIf (config.boot.supportedFilesystems.glusterfs or false) { system.fsPackages = [ pkgs.glusterfs ]; diff --git a/nixos/modules/tasks/filesystems/jfs.nix b/nixos/modules/tasks/filesystems/jfs.nix index b5132b4caa33..73ddb0fb18bb 100644 --- a/nixos/modules/tasks/filesystems/jfs.nix +++ b/nixos/modules/tasks/filesystems/jfs.nix @@ -3,10 +3,10 @@ with lib; let - inInitrd = any (fs: fs == "jfs") config.boot.initrd.supportedFilesystems; + inInitrd = config.boot.initrd.supportedFilesystems.jfs or false; in { - config = mkIf (any (fs: fs == "jfs") config.boot.supportedFilesystems) { + config = mkIf (config.boot.supportedFilesystems.jfs or false) { system.fsPackages = [ pkgs.jfsutils ]; diff --git a/nixos/modules/tasks/filesystems/nfs.nix b/nixos/modules/tasks/filesystems/nfs.nix index 8c631f0772db..462568b5db3e 100644 --- a/nixos/modules/tasks/filesystems/nfs.nix +++ b/nixos/modules/tasks/filesystems/nfs.nix @@ -4,7 +4,7 @@ with lib; let - inInitrd = any (fs: fs == "nfs") config.boot.initrd.supportedFilesystems; + inInitrd = config.boot.initrd.supportedFilesystems.nfs or false; nfsStateDir = "/var/lib/nfs"; @@ -58,7 +58,7 @@ in ###### implementation - config = mkIf (any (fs: fs == "nfs" || fs == "nfs4") config.boot.supportedFilesystems) { + config = mkIf (config.boot.supportedFilesystems.nfs or config.boot.supportedFilesystems.nfs4 or false) { services.rpcbind.enable = true; diff --git a/nixos/modules/tasks/filesystems/ntfs.nix b/nixos/modules/tasks/filesystems/ntfs.nix index c40d2a1a80bc..99ba494a7a39 100644 --- a/nixos/modules/tasks/filesystems/ntfs.nix +++ b/nixos/modules/tasks/filesystems/ntfs.nix @@ -3,7 +3,7 @@ with lib; { - config = mkIf (any (fs: fs == "ntfs" || fs == "ntfs-3g") config.boot.supportedFilesystems) { + config = mkIf (config.boot.supportedFilesystems.ntfs or config.boot.supportedFilesystems.ntfs-3g or false) { system.fsPackages = [ pkgs.ntfs3g ]; diff --git a/nixos/modules/tasks/filesystems/reiserfs.nix b/nixos/modules/tasks/filesystems/reiserfs.nix index 3c6a0f0cd917..f3f5e6aaa10b 100644 --- a/nixos/modules/tasks/filesystems/reiserfs.nix +++ b/nixos/modules/tasks/filesystems/reiserfs.nix @@ -4,12 +4,12 @@ with lib; let - inInitrd = any (fs: fs == "reiserfs") config.boot.initrd.supportedFilesystems; + inInitrd = config.boot.initrd.supportedFilesystems.reiserfs or false; in { - config = mkIf (any (fs: fs == "reiserfs") config.boot.supportedFilesystems) { + config = mkIf (config.boot.supportedFilesystems.reiserfs or false) { system.fsPackages = [ pkgs.reiserfsprogs ]; diff --git a/nixos/modules/tasks/filesystems/squashfs.nix b/nixos/modules/tasks/filesystems/squashfs.nix index 10d45a21d3ca..a0fac904766a 100644 --- a/nixos/modules/tasks/filesystems/squashfs.nix +++ b/nixos/modules/tasks/filesystems/squashfs.nix @@ -2,7 +2,7 @@ let - inInitrd = lib.any (fs: fs == "squashfs") config.boot.initrd.supportedFilesystems; + inInitrd = config.boot.initrd.supportedFilesystems.squashfs or false; in diff --git a/nixos/modules/tasks/filesystems/sshfs.nix b/nixos/modules/tasks/filesystems/sshfs.nix index cd71dda16d8b..63ff7f2b6b39 100644 --- a/nixos/modules/tasks/filesystems/sshfs.nix +++ b/nixos/modules/tasks/filesystems/sshfs.nix @@ -1,7 +1,11 @@ { config, lib, pkgs, ... }: { - config = lib.mkIf (lib.any (fs: fs == "sshfs" || fs == "fuse.sshfs") config.boot.supportedFilesystems) { - system.fsPackages = [ pkgs.sshfs ]; - }; + config = lib.mkIf + (config.boot.supportedFilesystems.sshfs + or config.boot.supportedFilesystems."fuse.sshfs" + or false) + { + system.fsPackages = [ pkgs.sshfs ]; + }; } diff --git a/nixos/modules/tasks/filesystems/unionfs-fuse.nix b/nixos/modules/tasks/filesystems/unionfs-fuse.nix index f9954b5182f9..929454ff1529 100644 --- a/nixos/modules/tasks/filesystems/unionfs-fuse.nix +++ b/nixos/modules/tasks/filesystems/unionfs-fuse.nix @@ -3,7 +3,7 @@ { config = lib.mkMerge [ - (lib.mkIf (lib.any (fs: fs == "unionfs-fuse") config.boot.initrd.supportedFilesystems) { + (lib.mkIf (config.boot.initrd.supportedFilesystems.unionfs-fuse or false) { boot.initrd.kernelModules = [ "fuse" ]; boot.initrd.extraUtilsCommands = lib.mkIf (!config.boot.initrd.systemd.enable) '' @@ -35,7 +35,7 @@ }; }) - (lib.mkIf (lib.any (fs: fs == "unionfs-fuse") config.boot.supportedFilesystems) { + (lib.mkIf (config.boot.supportedFilesystems.unionfs-fuse or false) { system.fsPackages = [ pkgs.unionfs-fuse ]; }) diff --git a/nixos/modules/tasks/filesystems/vboxsf.nix b/nixos/modules/tasks/filesystems/vboxsf.nix index 5497194f6a8d..00245b5af252 100644 --- a/nixos/modules/tasks/filesystems/vboxsf.nix +++ b/nixos/modules/tasks/filesystems/vboxsf.nix @@ -4,7 +4,7 @@ with lib; let - inInitrd = any (fs: fs == "vboxsf") config.boot.initrd.supportedFilesystems; + inInitrd = config.boot.initrd.supportedFilesystems.vboxsf or false; package = pkgs.runCommand "mount.vboxsf" { preferLocalBuild = true; } '' mkdir -p $out/bin @@ -13,7 +13,7 @@ let in { - config = mkIf (any (fs: fs == "vboxsf") config.boot.supportedFilesystems) { + config = mkIf (config.boot.supportedFilesystems.vboxsf or false) { system.fsPackages = [ package ]; diff --git a/nixos/modules/tasks/filesystems/vfat.nix b/nixos/modules/tasks/filesystems/vfat.nix index 9281b34633c2..d7acc0c9e50b 100644 --- a/nixos/modules/tasks/filesystems/vfat.nix +++ b/nixos/modules/tasks/filesystems/vfat.nix @@ -4,12 +4,12 @@ with lib; let - inInitrd = any (fs: fs == "vfat") config.boot.initrd.supportedFilesystems; + inInitrd = config.boot.initrd.supportedFilesystems.vfat or false; in { - config = mkIf (any (fs: fs == "vfat") config.boot.supportedFilesystems) { + config = mkIf (config.boot.supportedFilesystems.vfat or false) { system.fsPackages = [ pkgs.dosfstools pkgs.mtools ]; diff --git a/nixos/modules/tasks/filesystems/xfs.nix b/nixos/modules/tasks/filesystems/xfs.nix index 76f31e660ad3..50dc1b3340aa 100644 --- a/nixos/modules/tasks/filesystems/xfs.nix +++ b/nixos/modules/tasks/filesystems/xfs.nix @@ -4,12 +4,12 @@ with lib; let - inInitrd = any (fs: fs == "xfs") config.boot.initrd.supportedFilesystems; + inInitrd = config.boot.initrd.supportedFilesystems.xfs or false; in { - config = mkIf (any (fs: fs == "xfs") config.boot.supportedFilesystems) { + config = mkIf (config.boot.supportedFilesystems.xfs or false) { system.fsPackages = [ pkgs.xfsprogs.bin ]; diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index b289d2151eb7..98df6a40e8a1 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -20,8 +20,8 @@ let clevisDatasets = map (e: e.device) (filter (e: e.device != null && (hasAttr e.device config.boot.initrd.clevis.devices) && e.fsType == "zfs" && (fsNeededForBoot e)) config.system.build.fileSystems); - inInitrd = any (fs: fs == "zfs") config.boot.initrd.supportedFilesystems; - inSystem = any (fs: fs == "zfs") config.boot.supportedFilesystems; + inInitrd = config.boot.initrd.supportedFilesystems.zfs or false; + inSystem = config.boot.supportedFilesystems.zfs or false; autosnapPkg = pkgs.zfstools.override { zfs = cfgZfs.package; diff --git a/nixos/modules/virtualisation/cri-o.nix b/nixos/modules/virtualisation/cri-o.nix index dacd700537c7..417cf516c7f4 100644 --- a/nixos/modules/virtualisation/cri-o.nix +++ b/nixos/modules/virtualisation/cri-o.nix @@ -6,7 +6,7 @@ let crioPackage = pkgs.cri-o.override { extraPackages = cfg.extraPackages - ++ lib.optional (builtins.elem "zfs" config.boot.supportedFilesystems) config.boot.zfs.package; + ++ lib.optional (config.boot.supportedFilesystems.zfs or false) config.boot.zfs.package; }; format = pkgs.formats.toml { }; diff --git a/nixos/modules/virtualisation/podman/default.nix b/nixos/modules/virtualisation/podman/default.nix index 47382f9beab0..64b6fb61590d 100644 --- a/nixos/modules/virtualisation/podman/default.nix +++ b/nixos/modules/virtualisation/podman/default.nix @@ -9,7 +9,7 @@ let extraPackages = cfg.extraPackages # setuid shadow ++ [ "/run/wrappers" ] - ++ lib.optional (builtins.elem "zfs" config.boot.supportedFilesystems) config.boot.zfs.package; + ++ lib.optional (config.boot.supportedFilesystems.zfs or false) config.boot.zfs.package; }); # Provides a fake "docker" binary mapping to podman diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 7576fae41f83..b6cb6a0c6d45 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -526,8 +526,7 @@ let curl ] ++ optionals (bootLoader == "grub") (let - zfsSupport = lib.any (x: x == "zfs") - (extraInstallerConfig.boot.supportedFilesystems or []); + zfsSupport = extraInstallerConfig.boot.supportedFilesystems.zfs or false; in [ (pkgs.grub2.override { inherit zfsSupport; }) (pkgs.grub2_efi.override { inherit zfsSupport; }) From 1c153713930102fab49d67135a3b337327024fc5 Mon Sep 17 00:00:00 2001 From: ardishco-the-great Date: Mon, 19 Feb 2024 19:03:36 +0300 Subject: [PATCH 020/160] vinegar: added overrideAttrs comment back (minor change) --- pkgs/by-name/vi/vinegar/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/vi/vinegar/package.nix b/pkgs/by-name/vi/vinegar/package.nix index 9873d6b5d187..19dd30209443 100644 --- a/pkgs/by-name/vi/vinegar/package.nix +++ b/pkgs/by-name/vi/vinegar/package.nix @@ -12,6 +12,7 @@ , fetchpatch }: let + # wine-staging doesn't support overrideAttrs for now wine = wine64Packages.staging.overrideDerivation (oldAttrs: { patches = (oldAttrs.patches or []) From 36d6a4f2784741dba326e7d506e12b33f508e243 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 19 Feb 2024 13:54:47 -0800 Subject: [PATCH 021/160] python311Packages.structlog: add dotlambda to maintainers --- pkgs/development/python-modules/structlog/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/structlog/default.nix b/pkgs/development/python-modules/structlog/default.nix index f53e3c90945d..a7d0d55a4ee5 100644 --- a/pkgs/development/python-modules/structlog/default.nix +++ b/pkgs/development/python-modules/structlog/default.nix @@ -61,6 +61,6 @@ buildPythonPackage rec { homepage = "https://github.com/hynek/structlog"; changelog = "https://github.com/hynek/structlog/blob/${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ dotlambda ]; }; } From bd57ffe6e7239c59fd5567d8fd87b4e596429975 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 19 Feb 2024 13:52:01 -0800 Subject: [PATCH 022/160] python311Packages.structlog: 23.2.0 -> 24.1.0 Diff: https://github.com/hynek/structlog/compare/refs/tags/23.2.0...24.1.0 Changelog: https://github.com/hynek/structlog/blob/24.1.0/CHANGELOG.md --- .../python-modules/structlog/default.nix | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/structlog/default.nix b/pkgs/development/python-modules/structlog/default.nix index a7d0d55a4ee5..a6c826a00a5e 100644 --- a/pkgs/development/python-modules/structlog/default.nix +++ b/pkgs/development/python-modules/structlog/default.nix @@ -11,13 +11,12 @@ , pythonOlder , simplejson , twisted -, typing-extensions }: buildPythonPackage rec { pname = "structlog"; - version = "23.2.0"; - format = "pyproject"; + version = "24.1.0"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +24,7 @@ buildPythonPackage rec { owner = "hynek"; repo = "structlog"; rev = "refs/tags/${version}"; - hash = "sha256-KSHKgkv+kObKCdWZDg5o6QYe0AMND9VLdEuseY/GyDY="; + hash = "sha256-0Yc28UEeozK2+IqILFTqHoTiM5L2SA4t6jld4qTBSzQ="; }; nativeBuildInputs = [ @@ -34,10 +33,6 @@ buildPythonPackage rec { hatchling ]; - propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ - typing-extensions - ]; - nativeCheckInputs = [ freezegun pretend @@ -47,11 +42,6 @@ buildPythonPackage rec { twisted ]; - disabledTests = [ - # _pickle.PicklingError: Only BytesLoggers to sys.stdout and sys.stderr can be pickled. - "test_pickle" - ]; - pythonImportsCheck = [ "structlog" ]; From fa8d81f7bae66c758fc22868e2c12f3dceef41ff Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 20 Feb 2024 20:12:43 +0100 Subject: [PATCH 023/160] platformio: disable version check reimplements #232356 --- pkgs/development/embedded/platformio/core.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/embedded/platformio/core.nix b/pkgs/development/embedded/platformio/core.nix index d2d4418f13b9..b36d5367e65e 100644 --- a/pkgs/development/embedded/platformio/core.nix +++ b/pkgs/development/embedded/platformio/core.nix @@ -43,6 +43,11 @@ with python3Packages; buildPythonApplication rec { }) ]; + postPatch = '' + # Disable update checks at runtime + substituteInPlace platformio/maintenance.py --replace-fail ' check_platformio_upgrade()' "" + ''; + nativeBuildInputs = [ installShellFiles pythonRelaxDepsHook From 9f2258bf4b57f3d38f3cef02557c9552133dc423 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 Feb 2024 23:30:39 +0000 Subject: [PATCH 024/160] storj-uplink: 1.96.2 -> 1.98.2 --- pkgs/applications/networking/sync/storj-uplink/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/sync/storj-uplink/default.nix b/pkgs/applications/networking/sync/storj-uplink/default.nix index d1f141be8229..e7ed00d78630 100644 --- a/pkgs/applications/networking/sync/storj-uplink/default.nix +++ b/pkgs/applications/networking/sync/storj-uplink/default.nix @@ -5,18 +5,18 @@ buildGoModule rec { pname = "storj-uplink"; - version = "1.96.2"; + version = "1.98.2"; src = fetchFromGitHub { owner = "storj"; repo = "storj"; rev = "v${version}"; - hash = "sha256-mQIrXDEfMMrubQyn90eu0k3isvnpaF237Tpd84HhUfU="; + hash = "sha256-XnTrQIDUHdW9HwnYRigGFMGmcSCBhdoTXT4xlMCMeCw="; }; subPackages = [ "cmd/uplink" ]; - vendorHash = "sha256-cUhdl0jqgkA89NeOdFSifR5LsTjeYifOXqBu3qCAovk="; + vendorHash = "sha256-n7exLjiDyvnoKAKnJXo1Ag+jh1Ccb2eA3Yv5fg7gkDk="; ldflags = [ "-s" "-w" ]; From 91815b8f47bf965539bb80bc2564af02a8ce2f28 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 21 Feb 2024 04:20:00 +0000 Subject: [PATCH 025/160] chez: 9.6.4 -> 10.0.0 Diff: https://github.com/cisco/ChezScheme/compare/v9.6.4...v10.0.0 Changelog: https://cisco.github.io/ChezScheme/release_notes/v10.0/release_notes.html --- pkgs/development/compilers/chez/default.nix | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/pkgs/development/compilers/chez/default.nix b/pkgs/development/compilers/chez/default.nix index fc7dfa78cefe..9327b69998f7 100644 --- a/pkgs/development/compilers/chez/default.nix +++ b/pkgs/development/compilers/chez/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "chez-scheme"; - version = "9.6.4"; + version = "10.0.0"; src = fetchurl { url = "https://github.com/cisco/ChezScheme/releases/download/v${finalAttrs.version}/csv${finalAttrs.version}.tar.gz"; - hash = "sha256-9YJ2gvolnEeXX/4Hh4X7Vh5KXFT3ZDMe9mwyEyhDaF0="; + hash = "sha256-03GZASte0ZhcQGnWqH/xjl4fWi3yfkApkfr0XcTyIyw="; }; nativeBuildInputs = lib.optional stdenv.isDarwin cctools; @@ -28,18 +28,11 @@ stdenv.mkDerivation (finalAttrs: { ** NixOS or in any chroot build. */ patchPhase = '' - substituteInPlace ./configure \ - --replace "git submodule init && git submodule update || exit 1" "true" - - substituteInPlace ./workarea \ - --replace "/bin/ln" ln \ - --replace "/bin/cp" cp - substituteInPlace ./makefiles/installsh \ - --replace "/usr/bin/true" "${coreutils}/bin/true" + --replace-warn "/usr/bin/true" "${coreutils}/bin/true" substituteInPlace zlib/configure \ - --replace "/usr/bin/libtool" libtool + --replace-warn "/usr/bin/libtool" libtool ''; /* @@ -52,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { ** for. */ configurePhase = '' - ./configure --threads --installprefix=$out --installman=$out/share/man + ./configure --as-is --threads --installprefix=$out --installman=$out/share/man ''; /* From 5e7907a11102a285d45e210ab88c59590f67a0a8 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 21 Feb 2024 04:20:00 +0000 Subject: [PATCH 026/160] chez: add meta.mainProgram --- pkgs/development/compilers/chez/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/chez/default.nix b/pkgs/development/compilers/chez/default.nix index 9327b69998f7..dfdb47f5db24 100644 --- a/pkgs/development/compilers/chez/default.nix +++ b/pkgs/development/compilers/chez/default.nix @@ -64,5 +64,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ thoughtpolice ]; platforms = lib.platforms.unix; badPlatforms = [ "aarch64-linux" "aarch64-darwin" ]; + mainProgram = "scheme"; }; }) From 1fb5e0221fae5428666a01cfb0582eaa34890056 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 21 Feb 2024 04:20:00 +0000 Subject: [PATCH 027/160] chez: add version tester --- pkgs/development/compilers/chez/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/chez/default.nix b/pkgs/development/compilers/chez/default.nix index dfdb47f5db24..9a8338f06730 100644 --- a/pkgs/development/compilers/chez/default.nix +++ b/pkgs/development/compilers/chez/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl , coreutils, cctools -, ncurses, libiconv, libX11, libuuid +, ncurses, libiconv, libX11, libuuid, testers }: stdenv.mkDerivation (finalAttrs: { @@ -57,6 +57,12 @@ stdenv.mkDerivation (finalAttrs: { setupHook = ./setup-hook.sh; + passthru.tests = { + version = testers.testVersion { + package = finalAttrs.finalPackage; + }; + }; + meta = { description = "A powerful and incredibly fast R6RS Scheme compiler"; homepage = "https://cisco.github.io/ChezScheme/"; From 7f015402ebdd52be1d630b5ffd00decaf6b01f18 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 21 Feb 2024 21:44:14 +0000 Subject: [PATCH 028/160] ddns-go: 6.0.3 -> 6.1.2 --- pkgs/tools/networking/ddns-go/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/ddns-go/default.nix b/pkgs/tools/networking/ddns-go/default.nix index 0c5882a1c392..957bfcd90917 100644 --- a/pkgs/tools/networking/ddns-go/default.nix +++ b/pkgs/tools/networking/ddns-go/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "ddns-go"; - version = "6.0.3"; + version = "6.1.2"; src = fetchFromGitHub { owner = "jeessy2"; repo = pname; rev = "v${version}"; - hash = "sha256-hfL4heW2p1JdNEAQqsRMmvXSeBkw/zWfXk0YPXyqLXk="; + hash = "sha256-OKQRcYG3t7sU/HSmnkViWWm1is0fhrb6nyh8ahl/l6U="; }; - vendorHash = "sha256-UsMeYI/YogTbwyaJjVZbGMbxa434BDRBF+5VoSk6G9k="; + vendorHash = "sha256-VCp+seFaYXElQmktYlWm+nW4gNwNocOVm7T+M6+AdNg="; ldflags = [ "-X main.version=${version}" From 28e2594c1e6d538d5fd261aac76d225b1271c151 Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Thu, 22 Feb 2024 11:45:15 +0800 Subject: [PATCH 029/160] tang: 14 -> 15 --- pkgs/servers/tang/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/tang/default.nix b/pkgs/servers/tang/default.nix index 4206973dbd15..e6581921fcb7 100644 --- a/pkgs/servers/tang/default.nix +++ b/pkgs/servers/tang/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "tang"; - version = "14"; + version = "15"; src = fetchFromGitHub { owner = "latchset"; repo = "tang"; rev = "refs/tags/v${version}"; - hash = "sha256-QKURKb2g71pZvuZlJk3Rc26H3oU0WSkjgQtJQLrYGbw="; + hash = "sha256-nlC2hdNzQZrfirjS2gX4oFp2OD1OdxmLsN03hfxD3ug="; }; nativeBuildInputs = [ From 2a58797444db810cc091aada159fed626c1fb53e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 22 Feb 2024 04:20:00 +0000 Subject: [PATCH 030/160] chez: remove meta.badPlatforms --- pkgs/development/compilers/chez/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/compilers/chez/default.nix b/pkgs/development/compilers/chez/default.nix index 9a8338f06730..c0448a7e6d4f 100644 --- a/pkgs/development/compilers/chez/default.nix +++ b/pkgs/development/compilers/chez/default.nix @@ -69,7 +69,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ thoughtpolice ]; platforms = lib.platforms.unix; - badPlatforms = [ "aarch64-linux" "aarch64-darwin" ]; mainProgram = "scheme"; }; }) From fe682a75a3ab581d5f67d61f650cbc972df9a318 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 Feb 2024 20:01:43 +0000 Subject: [PATCH 031/160] cloudflared: 2024.2.0 -> 2024.2.1 --- pkgs/applications/networking/cloudflared/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index 9e597df79288..00e471590ec4 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2024.2.0"; + version = "2024.2.1"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = "refs/tags/${version}"; - hash = "sha256-jcIHpRHcAgzzSKvZH9SLfu5Ake3zCgsSw1iv64yXW2E="; + hash = "sha256-aSAwDz7QSYbHfDA+/usGh7xCxSq+kBTB3eqMBf5XEa8="; }; vendorHash = null; From a8afa87f987278ce608fb3775db426edcd3288a2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 Feb 2024 22:02:04 +0000 Subject: [PATCH 032/160] vcluster: 0.18.1 -> 0.19.1 --- pkgs/applications/networking/cluster/vcluster/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/vcluster/default.nix b/pkgs/applications/networking/cluster/vcluster/default.nix index ab44da15a8d0..db2ea91fd054 100644 --- a/pkgs/applications/networking/cluster/vcluster/default.nix +++ b/pkgs/applications/networking/cluster/vcluster/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vcluster"; - version = "0.18.1"; + version = "0.19.1"; src = fetchFromGitHub { owner = "loft-sh"; repo = pname; rev = "v${version}"; - hash = "sha256-TJjMB7x8MOlr3GexsnOZBFPJovVkf4ByRn1aGprvZFQ="; + hash = "sha256-W9BSLGUrW8Us+yYQLIz3oY8JKJSo43cL+oWQQf3xWJE="; }; vendorHash = null; From a02aaf88900481acae86f0bd93200b5503cdd57a Mon Sep 17 00:00:00 2001 From: wackbyte Date: Wed, 21 Feb 2024 20:38:12 -0500 Subject: [PATCH 033/160] rojo: 7.4.0 -> 7.4.1 --- pkgs/development/tools/rojo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rojo/default.nix b/pkgs/development/tools/rojo/default.nix index 1eaeed08316a..0ed91bd18e3e 100644 --- a/pkgs/development/tools/rojo/default.nix +++ b/pkgs/development/tools/rojo/default.nix @@ -12,17 +12,17 @@ let in rustPlatform.buildRustPackage rec { pname = "rojo"; - version = "7.4.0"; + version = "7.4.1"; src = fetchFromGitHub { owner = "rojo-rbx"; repo = "rojo"; rev = "v${version}"; - sha256 = "sha256-Eh1G0jX9KXVlMZLl8whxULywadblWml232qvcq4JLJ4="; + hash = "sha256-7fnzNYAbsZW/48C4dwpMXXQy2ZgxbYFSs85wNKGcu/4="; fetchSubmodules = true; }; - cargoSha256 = "sha256-aKfgylY9aspL1JpdYa6hOy/6lQoqO54OhZWqSlMPZ8o="; + cargoHash = "sha256-9kmSNWsZY0OcqaYOCblMwkXTdGXhj7f/2pUDx/L/o2o="; nativeBuildInputs = [ pkg-config From 32266c62454e97664b1742dc4f4367f821367c6d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 23 Feb 2024 01:42:47 +0100 Subject: [PATCH 034/160] home-assistant-custom-lovelace-modules.multiple-entity-row: 4.5.0 -> 4.5.1 https://github.com/benct/lovelace-multiple-entity-row/releases/tag/v4.5.1 --- .../custom-lovelace-modules/multiple-entity-row/default.nix | 4 ++-- .../custom-lovelace-modules/multiple-entity-row/package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/multiple-entity-row/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/multiple-entity-row/default.nix index 64a3bf351aa6..0ba1bcec0cc6 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/multiple-entity-row/default.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/multiple-entity-row/default.nix @@ -6,13 +6,13 @@ mkYarnPackage rec { pname = "multiple-entity-row"; - version = "4.5.0"; + version = "4.5.1"; src = fetchFromGitHub { owner = "benct"; repo = "lovelace-multiple-entity-row"; rev = "v${version}"; - hash = "sha256-3CkBzxB3bX4jwk71PaRMX1MkAb6UVOBqZCYpTN7VORY="; + hash = "sha256-CXRgXyH1NUg7ssQhenqP0tXr1m2qOkHna3Rf30K3SjI="; }; packageJSON = ./package.json; diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/multiple-entity-row/package.json b/pkgs/servers/home-assistant/custom-lovelace-modules/multiple-entity-row/package.json index 7cb2274007d4..28a6d7b3bb86 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/multiple-entity-row/package.json +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/multiple-entity-row/package.json @@ -1,6 +1,6 @@ { "name": "multiple-entity-row", - "version": "4.5.0", + "version": "4.5.1", "description": "Show multiple entity states, attributes and icons on entity rows in Home Assistant's Lovelace UI", "keywords": [ "home-assistant", From 094f6b98c7afca9012a48cac3ceb71419308537b Mon Sep 17 00:00:00 2001 From: Hraban Luyat Date: Thu, 19 Oct 2023 11:54:08 -0400 Subject: [PATCH 035/160] sbcl: doCheck = true --- pkgs/development/compilers/sbcl/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 2f18dcc78d4c..c74f213943ba 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -161,6 +161,13 @@ stdenv.mkDerivation rec { runHook postBuild ''; + doCheck = true; + + # From the INSTALL docs + checkPhase = '' + (cd tests && sh run-tests.sh) + ''; + installPhase = '' runHook preInstall From d09db9c0967989234a07a4188f43392271b5ed7e Mon Sep 17 00:00:00 2001 From: Hraban Luyat Date: Mon, 23 Oct 2023 12:30:27 -0400 Subject: [PATCH 036/160] sbcl: fix patching of test files & timestamps MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It’s unclear what problem the test patching was trying to solve, but on current SBCL builds this does more harm than good. Removing those patches leaves the test in its original state, which builds and passes. As for the timestamps: also unclear, removing it doesn’t seem to affect anything either way and this feels very much like a fix for /nix/store read-only access. I’ve test SBCL without these and it works fine, so I don’t think this is relevant anymore? Unfortunately there are no comments so it’s hard to know why these existed. --- pkgs/development/compilers/sbcl/default.nix | 32 ++++++--------------- 1 file changed, 8 insertions(+), 24 deletions(-) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index c74f213943ba..3a1533ddf607 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -85,27 +85,13 @@ stdenv.mkDerivation rec { ./fix-2.4.0-aarch64-darwin.patch ]; - postPatch = '' - echo '"${version}.nixos"' > version.lisp-expr - - # SBCL checks whether files are up-to-date in many places.. - # Unfortunately, same timestamp is not good enough - sed -e 's@> x y@>= x y@' -i contrib/sb-aclrepl/repl.lisp - #sed -e '/(date)/i((= date 2208988801) 2208988800)' -i contrib/asdf/asdf.lisp - sed -i src/cold/slam.lisp -e \ - '/file-write-date input/a)' - sed -i src/cold/slam.lisp -e \ - '/file-write-date output/i(or (and (= 2208988801 (file-write-date output)) (= 2208988801 (file-write-date input)))' - sed -i src/code/target-load.lisp -e \ - '/date defaulted-fasl/a)' - sed -i src/code/target-load.lisp -e \ - '/date defaulted-source/i(or (and (= 2208988801 (file-write-date defaulted-source-truename)) (= 2208988801 (file-write-date defaulted-fasl-truename)))' - - # Fix the tests - sed -e '5,$d' -i contrib/sb-bsd-sockets/tests.lisp - sed -e '5,$d' -i contrib/sb-simple-streams/*test*.lisp - '' - + (if purgeNixReferences + postPatch = (lib.optionalString (builtins.elem stdenv.hostPlatform.system [ + "x86_64-linux" + "x86_64-darwin" + "aarch64-linux" + ]) '' + rm -f tests/foreign-stack-alignment.impure.lisp + '') + (if purgeNixReferences then # This is the default location to look for the core; by default in $out/lib/sbcl '' @@ -117,9 +103,7 @@ stdenv.mkDerivation rec { '' sed -e "s@/bin/uname@$(command -v uname)@g" -i src/code/*-os.lisp \ src/code/run-program.lisp - '' - ); - + ''); preBuild = '' export INSTALL_ROOT=$out From b1f97bf100a8b1c0c1938a1b633d08c1c141b0de Mon Sep 17 00:00:00 2001 From: Hraban Luyat Date: Sat, 20 Jan 2024 12:17:49 -0500 Subject: [PATCH 037/160] sbcl: remove unused import --- pkgs/development/compilers/sbcl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 3a1533ddf607..5d50f4c97575 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, callPackage, clisp, fetchurl, fetchpatch, writeText, zstd +{ lib, stdenv, callPackage, clisp, fetchurl, writeText, zstd , threadSupport ? (stdenv.hostPlatform.isx86 || "aarch64-linux" == stdenv.hostPlatform.system || "aarch64-darwin" == stdenv.hostPlatform.system) , linkableRuntime ? stdenv.hostPlatform.isx86 , disableImmobileSpace ? false From 637caf331a6a27b894f803d0626e250805b6e879 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?AsPulse=20/=20=E3=81=82=E3=81=99=E3=81=B1=E3=82=8B?= Date: Fri, 23 Feb 2024 12:39:38 +0900 Subject: [PATCH 038/160] maintainers: add aspulse --- maintainers/maintainer-list.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 21c1cbd98b88..9f2aead5f21b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1755,6 +1755,15 @@ githubId = 453170; name = "Alastair Pharo"; }; + aspulse = { + email = "contact@aspulse.dev"; + github = "aspulse"; + githubId = 84216737; + name = "AsPulse / あすぱる"; + keys = [{ + fingerprint = "C919 E69E A7C0 E147 9E0F C26E 1EDA D0C6 70BD 062D"; + }]; + }; astavie = { email = "astavie@pm.me"; github = "astavie"; From d2b3e40f92ebb8a1039aabd6beb9b662a1bafd0a Mon Sep 17 00:00:00 2001 From: Simon Hollingshead Date: Fri, 23 Feb 2024 12:55:15 +0000 Subject: [PATCH 039/160] audiowaveform: Build with C++14. --- pkgs/tools/audio/audiowaveform/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/audio/audiowaveform/default.nix b/pkgs/tools/audio/audiowaveform/default.nix index 8f194df4d936..a435ede2e5cc 100644 --- a/pkgs/tools/audio/audiowaveform/default.nix +++ b/pkgs/tools/audio/audiowaveform/default.nix @@ -11,6 +11,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-FcQq0xWs3jH2MfhFQ5r5Vaz8B3akBHBSg8Z/k9An/Wg="; }; + cmakeFlags = [ + # gtest no longer supports C++11. + "-DCMAKE_CXX_STANDARD=14" + ]; + nativeBuildInputs = [ cmake gtest ]; buildInputs = [ boost gd libsndfile libmad libid3tag ]; From 5d1fa73585a1182b7eec268b3bcba632d346b575 Mon Sep 17 00:00:00 2001 From: Hraban Luyat Date: Fri, 23 Feb 2024 12:55:27 -0500 Subject: [PATCH 040/160] ecl: enable (install)check phase --- pkgs/development/compilers/ecl/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix index a9a7471275e5..a7611cba6168 100644 --- a/pkgs/development/compilers/ecl/default.nix +++ b/pkgs/development/compilers/ecl/default.nix @@ -65,6 +65,11 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; + # ECL’s ‘make check’ only works after install, making it a de-facto + # installCheck. + doInstallCheck = true; + installCheckTarget = "check"; + postInstall = '' sed -e 's/@[-a-zA-Z_]*@//g' -i $out/bin/ecl-config wrapProgram "$out/bin/ecl" --prefix PATH ':' "${ From 7f6cabbb3b30989174cb84c00260b21c272a9ee2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 23 Feb 2024 09:28:22 +0000 Subject: [PATCH 041/160] git-cliff: 1.4.0 -> 2.0.4 --- .../version-management/git-cliff/default.nix | 9 +++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/version-management/git-cliff/default.nix b/pkgs/applications/version-management/git-cliff/default.nix index 7a1179dba301..81db5902627f 100644 --- a/pkgs/applications/version-management/git-cliff/default.nix +++ b/pkgs/applications/version-management/git-cliff/default.nix @@ -3,26 +3,27 @@ , fetchFromGitHub , rustPlatform , Security +, SystemConfiguration }: rustPlatform.buildRustPackage rec { pname = "git-cliff"; - version = "1.4.0"; + version = "2.0.4"; src = fetchFromGitHub { owner = "orhun"; repo = "git-cliff"; rev = "v${version}"; - hash = "sha256-OK2eoWlqlpf/X8EGMnWTv9Gs5FkYvW5rmQDB/Mkbp60="; + hash = "sha256-0ReMn37sYpS5uX9Nem7M9LthAvGNdJaAob+tEnjIrMw="; }; - cargoHash = "sha256-gtkpZKOaG5p79uJ9cbbGdiOX57bDFTf2/Bd8+WToJrw="; + cargoHash = "sha256-xDIXXHoykEtRzWm5NDE1rcFgC4iFxhUPgwlvaoHmV6Y="; # attempts to run the program on .git in src which is not deterministic doCheck = false; buildInputs = lib.optionals stdenv.isDarwin [ - Security + Security SystemConfiguration ]; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 077b0a963a92..027f8d4eda9d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2338,7 +2338,7 @@ with pkgs; }; git-cliff = callPackage ../applications/version-management/git-cliff { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; git-codeowners = callPackage ../applications/version-management/git-codeowners { }; From 98893be5b8fcfa0c377092aa23521543532515c6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 23 Feb 2024 20:45:03 +0000 Subject: [PATCH 042/160] ares: 135 -> 136 --- pkgs/applications/emulators/bsnes/ares/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/emulators/bsnes/ares/default.nix b/pkgs/applications/emulators/bsnes/ares/default.nix index 25d2126ac34c..b3d362cd11aa 100644 --- a/pkgs/applications/emulators/bsnes/ares/default.nix +++ b/pkgs/applications/emulators/bsnes/ares/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ares"; - version = "135"; + version = "136"; src = fetchFromGitHub { owner = "ares-emulator"; repo = "ares"; rev = "v${finalAttrs.version}"; - hash = "sha256-SZhsMKjNxmT2eHsXAZcyMGoMhwWGgvXpDeZGGVn58Sc="; + hash = "sha256-Hks/MWusPiBVdb5L+53qtR6VmXG/P4rDzsvHxLeA8Do="; }; patches = [ From 949059e7c971468ca44a53f99f3d290ca98bd811 Mon Sep 17 00:00:00 2001 From: Hraban Luyat Date: Sat, 20 Jan 2024 12:18:35 -0500 Subject: [PATCH 043/160] sbcl: allow overriding bootstrapLisp Makes development more pleasant because using your existing SBCL as a boostrap host is considerably faster. --- pkgs/development/compilers/sbcl/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 5d50f4c97575..3d13d2e0ed05 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -10,6 +10,12 @@ , markRegionGC ? lib.versionAtLeast version "2.4.0" , texinfo , version + # Set this to a lisp binary to use a custom bootstrap lisp compiler for + # SBCL. Leave as null to use the default. This is useful for local development + # of SBCL, because you can use your existing stock SBCL as a boostrap. On Hydra + # of course we can’t do that because SBCL hasn’t been built yet, so we use + # CLISP, but that’s much slower. +, bootstrapLisp ? null }: let @@ -62,8 +68,10 @@ let sbclBootstrap = callPackage ./bootstrap.nix { cfg = bootstrapBinaries.${stdenv.hostPlatform.system}; }; - bootstrapLisp = - if (builtins.hasAttr stdenv.hostPlatform.system bootstrapBinaries) + bootstrapLisp' = + if bootstrapLisp != null + then bootstrapLisp + else if (builtins.hasAttr stdenv.hostPlatform.system bootstrapBinaries) then "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit" else "${clisp}/bin/clisp -E UTF-8 --silent -norc"; @@ -135,7 +143,7 @@ stdenv.mkDerivation rec { buildPhase = '' runHook preBuild - sh make.sh --prefix=$out --xc-host="${bootstrapLisp}" ${ + sh make.sh --prefix=$out --xc-host="${bootstrapLisp'}" ${ lib.concatStringsSep " " (builtins.map (x: "--with-${x}") enableFeatures ++ builtins.map (x: "--without-${x}") disableFeatures) From bf07f42487d37df20a4d839edabe7aae5820c205 Mon Sep 17 00:00:00 2001 From: Hraban Luyat Date: Sat, 20 Jan 2024 12:40:06 -0500 Subject: [PATCH 044/160] sbcl: allow overriding build flags from Nix E.g.: sbcl.overrideAttrs (old: { enableFeatures = old.enableFeatures ++ [ "foobar" ]; }) --- pkgs/development/compilers/sbcl/default.nix | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 3d13d2e0ed05..3b397a887894 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -77,7 +77,7 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation (self: rec { pname = "sbcl"; inherit version; @@ -130,7 +130,16 @@ stdenv.mkDerivation rec { optional (!threadSupport) "sb-thread" ++ optionals disableImmobileSpace [ "immobile-space" "immobile-code" "compact-instance-header" ]; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals (lib.versionOlder version "2.1.10") [ + buildArgs = [ + "--prefix=$out" + "--xc-host=${lib.escapeShellArg bootstrapLisp'}" + ] ++ builtins.map (x: "--with-${x}") self.enableFeatures + ++ builtins.map (x: "--without-${x}") self.disableFeatures + ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-darwin") [ + "--arch=arm64" + ]; + + env.NIX_CFLAGS_COMPILE = toString (lib.optionals (lib.versionOlder self.version "2.1.10") [ # Workaround build failure on -fno-common toolchains like upstream # clang-13. Without the change build fails as: # duplicate symbol '_static_code_space_free_pointer' in: alloc.o traceroot.o @@ -143,11 +152,7 @@ stdenv.mkDerivation rec { buildPhase = '' runHook preBuild - sh make.sh --prefix=$out --xc-host="${bootstrapLisp'}" ${ - lib.concatStringsSep " " - (builtins.map (x: "--with-${x}") enableFeatures ++ - builtins.map (x: "--without-${x}") disableFeatures) - } ${lib.optionalString (stdenv.hostPlatform.system == "aarch64-darwin") "--arch=arm64"} + sh make.sh ${lib.concatStringsSep " " self.buildArgs} (cd doc/manual ; make info) runHook postBuild @@ -197,4 +202,4 @@ stdenv.mkDerivation rec { "aarch64-linux" ]; }; -} +}) From b9464efdb307f4994578bd11db1181d8768c598e Mon Sep 17 00:00:00 2001 From: Hraban Luyat Date: Sun, 21 Jan 2024 19:15:15 -0500 Subject: [PATCH 045/160] sbcl: update meta.description field --- pkgs/development/compilers/sbcl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 3b397a887894..b3a0bff02112 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -190,7 +190,7 @@ stdenv.mkDerivation (self: rec { ''); meta = with lib; { - description = "Lisp compiler"; + description = "Common Lisp compiler"; homepage = "https://sbcl.org"; license = licenses.publicDomain; # and FreeBSD maintainers = lib.teams.lisp.members; From 5e8a9aa362c28d2e30fd952a874d0696460eadc7 Mon Sep 17 00:00:00 2001 From: Hraban Luyat Date: Thu, 1 Feb 2024 12:54:54 -0500 Subject: [PATCH 046/160] sbcl: include test binaries during checks --- pkgs/development/compilers/sbcl/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index b3a0bff02112..7ef7cd3201b1 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, callPackage, clisp, fetchurl, writeText, zstd +{ lib, stdenv, callPackage, clisp, fetchurl, strace, texinfo, which, writeText, zstd , threadSupport ? (stdenv.hostPlatform.isx86 || "aarch64-linux" == stdenv.hostPlatform.system || "aarch64-darwin" == stdenv.hostPlatform.system) , linkableRuntime ? stdenv.hostPlatform.isx86 , disableImmobileSpace ? false @@ -8,7 +8,6 @@ , purgeNixReferences ? false , coreCompression ? lib.versionAtLeast version "2.2.6" , markRegionGC ? lib.versionAtLeast version "2.4.0" -, texinfo , version # Set this to a lisp binary to use a custom bootstrap lisp compiler for # SBCL. Leave as null to use the default. This is useful for local development @@ -86,7 +85,15 @@ stdenv.mkDerivation (self: rec { inherit (versionMap.${version}) sha256; }; - nativeBuildInputs = [ texinfo ]; + nativeBuildInputs = [ + texinfo + ] ++ lib.optionals self.doCheck ( + [ + which + ] ++ lib.optionals (builtins.elem stdenv.system strace.meta.platforms) [ + strace + ] + ); buildInputs = lib.optionals coreCompression [ zstd ]; patches = lib.optionals (version == "2.4.0") [ From 65e6531546311119ceda42a10848b43990f9f39b Mon Sep 17 00:00:00 2001 From: Hraban Luyat Date: Thu, 1 Feb 2024 03:30:43 -0500 Subject: [PATCH 047/160] sbcl: disable floating point tests --- pkgs/development/compilers/sbcl/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 7ef7cd3201b1..62cb4ebbd587 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -106,6 +106,10 @@ stdenv.mkDerivation (self: rec { "aarch64-linux" ]) '' rm -f tests/foreign-stack-alignment.impure.lisp + # Floating point tests are fragile + # https://sourceforge.net/p/sbcl/mailman/message/58728554/ + rm -f tests/compiler.pure.lisp \ + tests/float.pure.lisp '') + (if purgeNixReferences then # This is the default location to look for the core; by default in $out/lib/sbcl From 5cd820b39a0aa98c1a8aeb86f7df4b53c7ff95e7 Mon Sep 17 00:00:00 2001 From: Hraban Luyat Date: Wed, 24 Jan 2024 15:10:00 -0500 Subject: [PATCH 048/160] sbcl: patch all paths to uname, env and sh --- pkgs/development/compilers/sbcl/default.nix | 36 ++++++++++++--------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 62cb4ebbd587..7a5b4170c976 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, callPackage, clisp, fetchurl, strace, texinfo, which, writeText, zstd +{ lib, stdenv, callPackage, clisp, coreutils, fetchurl, strace, texinfo, which, writeText, zstd , threadSupport ? (stdenv.hostPlatform.isx86 || "aarch64-linux" == stdenv.hostPlatform.system || "aarch64-darwin" == stdenv.hostPlatform.system) , linkableRuntime ? stdenv.hostPlatform.isx86 , disableImmobileSpace ? false @@ -100,7 +100,7 @@ stdenv.mkDerivation (self: rec { ./fix-2.4.0-aarch64-darwin.patch ]; - postPatch = (lib.optionalString (builtins.elem stdenv.hostPlatform.system [ + postPatch = lib.optionalString (builtins.elem stdenv.hostPlatform.system [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" @@ -110,19 +110,25 @@ stdenv.mkDerivation (self: rec { # https://sourceforge.net/p/sbcl/mailman/message/58728554/ rm -f tests/compiler.pure.lisp \ tests/float.pure.lisp - '') + (if purgeNixReferences - then - # This is the default location to look for the core; by default in $out/lib/sbcl - '' - sed 's@^\(#define SBCL_HOME\) .*$@\1 "/no-such-path"@' \ - -i src/runtime/runtime.c - '' - else - # Fix software version retrieval - '' - sed -e "s@/bin/uname@$(command -v uname)@g" -i src/code/*-os.lisp \ - src/code/run-program.lisp - ''); + '' + + lib.optionalString purgeNixReferences '' + # This is the default location to look for the core; by default in $out/lib/sbcl + sed 's@^\(#define SBCL_HOME\) .*$@\1 "/no-such-path"@' \ + -i src/runtime/runtime.c + '' + + '' + ( + shopt -s nullglob + # Tests need patching regardless of purging of paths from the final + # binary. There are some tricky files in nested directories which should + # definitely NOT be patched this way, hence just a single * (and no + # globstar). + substituteInPlace ${if purgeNixReferences then "tests" else "{tests,src/code}"}/*.{lisp,sh} \ + --replace-quiet /usr/bin/env "${coreutils}/bin/env" \ + --replace-quiet /bin/uname "${coreutils}/bin/uname" \ + --replace-quiet /bin/sh "${stdenv.shell}" + ) + ''; preBuild = '' export INSTALL_ROOT=$out From fb3be43ae1bf98789524db72cc3e85038b1127d5 Mon Sep 17 00:00:00 2001 From: Hraban Luyat Date: Thu, 1 Feb 2024 17:57:30 -0500 Subject: [PATCH 049/160] sbcl: run postInstall hook after installPhase --- pkgs/development/compilers/sbcl/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 7a5b4170c976..3389ccd600cc 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -187,7 +187,6 @@ stdenv.mkDerivation (self: rec { INSTALL_ROOT=$out sh install.sh - runHook postInstall '' + lib.optionalString (!purgeNixReferences) '' cp -r src $out/lib/sbcl @@ -197,6 +196,8 @@ stdenv.mkDerivation (self: rec { '(("SYS:SRC;**;*.*.*" #P"$out/lib/sbcl/src/**/*.*") ("SYS:CONTRIB;**;*.*.*" #P"$out/lib/sbcl/contrib/**/*.*"))) EOF + '' + '' + runHook postInstall ''; setupHook = lib.optional purgeNixReferences (writeText "setupHook.sh" '' From 1c6e7b5937f6bbbe0615f24870651ec6cda04ce4 Mon Sep 17 00:00:00 2001 From: Hraban Luyat Date: Thu, 1 Feb 2024 19:38:22 -0500 Subject: [PATCH 050/160] sbcl: run pre/postCheck hooks --- pkgs/development/compilers/sbcl/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 3389ccd600cc..5fab77f5fb34 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -179,7 +179,11 @@ stdenv.mkDerivation (self: rec { # From the INSTALL docs checkPhase = '' + runHook preCheck + (cd tests && sh run-tests.sh) + + runHook postCheck ''; installPhase = '' From e8de41602f7c3f90cd1d8d0b6c4650628338d2e0 Mon Sep 17 00:00:00 2001 From: Hraban Luyat Date: Mon, 5 Feb 2024 01:47:30 -0500 Subject: [PATCH 051/160] sbcl: find test binaries in PATH --- pkgs/development/compilers/sbcl/default.nix | 4 +- .../sbcl/search-for-binaries-in-PATH.patch | 108 ++++++++++++++++++ 2 files changed, 111 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/compilers/sbcl/search-for-binaries-in-PATH.patch diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 5fab77f5fb34..50f7900554d0 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -96,7 +96,9 @@ stdenv.mkDerivation (self: rec { ); buildInputs = lib.optionals coreCompression [ zstd ]; - patches = lib.optionals (version == "2.4.0") [ + patches = [ + ./search-for-binaries-in-PATH.patch + ] ++ lib.optionals (version == "2.4.0") [ ./fix-2.4.0-aarch64-darwin.patch ]; diff --git a/pkgs/development/compilers/sbcl/search-for-binaries-in-PATH.patch b/pkgs/development/compilers/sbcl/search-for-binaries-in-PATH.patch new file mode 100644 index 000000000000..95263ec85753 --- /dev/null +++ b/pkgs/development/compilers/sbcl/search-for-binaries-in-PATH.patch @@ -0,0 +1,108 @@ +From 35856b09e3606361b17f21225c759632be1cdf34 Mon Sep 17 00:00:00 2001 +From: Hraban Luyat +Date: Wed, 24 Jan 2024 14:58:53 -0500 +Subject: [PATCH] Search for binaries in tests in PATH, not /usr/bin +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Same as 8ed662fbfeb5dde35eb265f390b55b01f79f70c1 but for tests, and for more +than just ‘cat’. For the same reasons as that diff. +--- + tests/run-program.impure.lisp | 18 ++++++++++-------- + tests/run-program.test.sh | 9 ++++----- + 2 files changed, 14 insertions(+), 13 deletions(-) + +diff --git a/tests/run-program.impure.lisp b/tests/run-program.impure.lisp +index 0eab8884c..b07d1e4fb 100644 +--- a/tests/run-program.impure.lisp ++++ b/tests/run-program.impure.lisp +@@ -15,7 +15,7 @@ + + (defun bin-pwd-ignoring-result () + (let ((initially-open-fds (directory "/proc/self/fd/*" :resolve-symlinks nil))) +- (sb-ext:run-program "/usr/bin/pwd" nil :input :stream :output :stream :wait nil) ++ (sb-ext:run-program "pwd" nil :search t :input :stream :output :stream :wait nil) + (length initially-open-fds))) + + (with-test (:name (run-program :autoclose-streams) +@@ -49,7 +49,7 @@ + (with-test (:name (run-program :cat 2) + :skipped-on (or (not :sb-thread) :win32)) + ;; Tests that reading from a FIFO is interruptible. +- (let* ((process (run-program "/bin/cat" '() ++ (let* ((process (run-program "cat" '() :search t + :wait nil :output :stream :input :stream)) + (in (process-input process)) + (out (process-output process)) +@@ -167,7 +167,7 @@ + (defparameter *cat-out* (make-synonym-stream '*cat-out-pipe*))) + + (with-test (:name (run-program :cat 5) :fails-on :win32) +- (let ((cat (run-program "/bin/cat" nil :input *cat-in* :output *cat-out* ++ (let ((cat (run-program "cat" nil :search t :input *cat-in* :output *cat-out* + :wait nil))) + (dolist (test '("This is a test!" + "This is another test!" +@@ -310,14 +310,16 @@ + (let ((had-error-p nil)) + (flet ((barf (&optional (format :default)) + (with-output-to-string (stream) +- (run-program #-netbsd "/usr/bin/perl" #+netbsd "/usr/pkg/bin/perl" ++ (run-program #-netbsd "perl" #+netbsd "/usr/pkg/bin/perl" + '("-e" "print \"\\x20\\xfe\\xff\\x0a\"") ++ :search #-netbsd t #+netbsd nil + :output stream + :external-format format))) + (no-barf () + (with-output-to-string (stream) +- (run-program "/bin/echo" ++ (run-program "echo" + '("This is a test") ++ :search t + :output stream)))) + (handler-case + (barf :utf-8) +@@ -353,9 +355,9 @@ + ;; If the permitted inputs are :ANY then leave it be + (listp (symbol-value 'run-tests::*allowed-inputs*))) + (push (namestring file) (symbol-value 'run-tests::*allowed-inputs*))) +- (assert (null (run-program "/bin/cat" '() :input file))) +- (assert (null (run-program "/bin/cat" '() :output #.(or *compile-file-truename* +- *load-truename*) ++ (assert (null (run-program "cat" '() :search t :input file))) ++ (assert (null (run-program "cat" '() :search t :output #.(or *compile-file-truename* ++ *load-truename*) + :if-output-exists nil))))) + + +diff --git a/tests/run-program.test.sh b/tests/run-program.test.sh +index 48eaef889..c926e5a05 100755 +--- a/tests/run-program.test.sh ++++ b/tests/run-program.test.sh +@@ -39,9 +39,8 @@ run_sbcl --eval "(defvar *exit-ok* $EXIT_LISP_WIN)" <<'EOF' + (assert (not (zerop (sb-ext:process-exit-code + (sb-ext:run-program "false" () :search t :wait t))))) + (let ((string (with-output-to-string (stream) +- (our-run-program "/bin/echo" +- '("foo" "bar") +- :output stream)))) ++ (run-program "echo" '("foo" "bar") ++ :search t :output stream)))) + (assert (string= string "foo bar + "))) + (format t ";;; Smoke tests: PASS~%") +@@ -103,8 +102,8 @@ run_sbcl --eval "(defvar *exit-ok* $EXIT_LISP_WIN)" <<'EOF' + ;; make sure that a stream input argument is basically reasonable. + (let ((string (let ((i (make-string-input-stream "abcdef"))) + (with-output-to-string (stream) +- (our-run-program "/bin/cat" () +- :input i :output stream))))) ++ (run-program "cat" () ++ :search t :input i :output stream))))) + (assert (= (length string) 6)) + (assert (string= string "abcdef"))) + +-- +2.43.0 + From f8719ace2a6f1e53ab850cd16d107246ab3e6d1d Mon Sep 17 00:00:00 2001 From: Hraban Luyat Date: Thu, 22 Feb 2024 23:13:21 -0500 Subject: [PATCH 052/160] sbcl: disable traceroot (GC) test on aarch64-linux MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This isn’t about perfect test coverage, but about codifying what works today. --- pkgs/development/compilers/sbcl/default.nix | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 50f7900554d0..351f4dd861ac 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -102,16 +102,27 @@ stdenv.mkDerivation (self: rec { ./fix-2.4.0-aarch64-darwin.patch ]; - postPatch = lib.optionalString (builtins.elem stdenv.hostPlatform.system [ + # I don’t know why these are failing (on ofBorg), and I’d rather just disable + # them and move forward with the succeeding tests than block testing + # altogether. One by one hopefully we can fix these (on ofBorg, + # upstream--somehow some way) in due time. + disabledTestFiles = lib.optionals (builtins.elem stdenv.hostPlatform.system [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" - ]) '' - rm -f tests/foreign-stack-alignment.impure.lisp + ]) [ + "foreign-stack-alignment.impure.lisp" # Floating point tests are fragile # https://sourceforge.net/p/sbcl/mailman/message/58728554/ - rm -f tests/compiler.pure.lisp \ - tests/float.pure.lisp + "compiler.pure.lisp" + "float.pure.lisp" + ] ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [ + # This is failing on aarch64-linux on ofBorg. Not on my local machine nor on + # a VM on my laptop. Not sure what’s wrong. + "traceroot.impure.lisp" + ]; + postPatch = lib.optionalString (self.disabledTestFiles != [ ]) '' + (cd tests ; rm -f ${lib.concatStringsSep " " self.disabledTestFiles}) '' + lib.optionalString purgeNixReferences '' # This is the default location to look for the core; by default in $out/lib/sbcl From 3029b8dc4dcd5cc0bcc8855c242795ab29f8d1cb Mon Sep 17 00:00:00 2001 From: Hraban Luyat Date: Fri, 23 Feb 2024 09:48:19 -0500 Subject: [PATCH 053/160] sbcl: disable all checks on x86_64-darwin --- pkgs/development/compilers/sbcl/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 351f4dd861ac..fbd0970848d1 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -108,7 +108,6 @@ stdenv.mkDerivation (self: rec { # upstream--somehow some way) in due time. disabledTestFiles = lib.optionals (builtins.elem stdenv.hostPlatform.system [ "x86_64-linux" - "x86_64-darwin" "aarch64-linux" ]) [ "foreign-stack-alignment.impure.lisp" @@ -188,7 +187,11 @@ stdenv.mkDerivation (self: rec { runHook postBuild ''; - doCheck = true; + # Tests on ofBorg’s x86_64-darwin platforms are so unstable that a random one + # will fail every other run. There’s a deeper problem here; we might as well + # disable them entirely so at least the other platforms get to benefit from + # testing. + doCheck = stdenv.hostPlatform.system != "x86_64-darwin"; # From the INSTALL docs checkPhase = '' From 31deaa7d3d478061a22ee16b080965ac10b1a6bf Mon Sep 17 00:00:00 2001 From: imlonghao Date: Sun, 29 Oct 2023 09:24:40 +0800 Subject: [PATCH 054/160] borgmatic: 1.8.1 -> 1.8.8 --- pkgs/tools/backup/borgmatic/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/borgmatic/default.nix b/pkgs/tools/backup/borgmatic/default.nix index 24d4e98ed1fa..2b3b9e92f90c 100644 --- a/pkgs/tools/backup/borgmatic/default.nix +++ b/pkgs/tools/backup/borgmatic/default.nix @@ -13,14 +13,14 @@ python3Packages.buildPythonApplication rec { pname = "borgmatic"; - version = "1.8.1"; + version = "1.8.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-XbihTQJtoiRRfwjMCP+XEPmbt7//zFPx1fIWOvn92Nc="; + sha256 = "sha256-dPWp8SH4//HJlCrF6YRaMb32idox1E0/Gd8qc/GmP4c="; }; - nativeCheckInputs = with python3Packages; [ flexmock pytestCheckHook pytest-cov ]; + nativeCheckInputs = with python3Packages; [ flexmock pytestCheckHook pytest-cov ] ++ passthru.optional-dependencies.apprise; # - test_borgmatic_version_matches_news_version # The file NEWS not available on the pypi source, and this test is useless @@ -40,6 +40,10 @@ python3Packages.buildPythonApplication rec { setuptools ]; + passthru.optional-dependencies = { + apprise = with python3Packages; [ apprise ]; + }; + postInstall = '' installShellCompletion --cmd borgmatic \ --bash <($out/bin/borgmatic --bash-completion) From 10e6b1690503106677d6a133e02078f6c6620fa4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Feb 2024 06:55:29 +0000 Subject: [PATCH 055/160] linuxKernel.packages.linux_5_15.facetimehd: 0.5.18 -> 0.6.8 --- pkgs/os-specific/linux/facetimehd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/facetimehd/default.nix b/pkgs/os-specific/linux/facetimehd/default.nix index 3bb656e8cb09..30d232f6eb88 100644 --- a/pkgs/os-specific/linux/facetimehd/default.nix +++ b/pkgs/os-specific/linux/facetimehd/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "facetimehd-${version}-${kernel.version}"; - version = "0.5.18"; + version = "0.6.8"; # Note: When updating this revision: # 1. Also update pkgs/os-specific/linux/firmware/facetimehd-firmware/ @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { owner = "patjak"; repo = "facetimehd"; rev = version; - sha256 = "sha256-UO8t2zrfdJlu4uzhhyWOuHIjJNVezIq3nUPGZeW/KJU="; + sha256 = "sha256-Tze85Hx1YmStAKenmF/S1JuMDq5eVjBcs3LSWXjyE7w="; }; preConfigure = '' From 837e9e39be7100043a1e47b75e3997c16980d04d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Feb 2024 06:57:17 +0000 Subject: [PATCH 056/160] linuxKernel.packages.linux_5_4.virtio_vmmci: 0.5.0 -> 0.6.0 --- pkgs/os-specific/linux/virtio_vmmci/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/virtio_vmmci/default.nix b/pkgs/os-specific/linux/virtio_vmmci/default.nix index 7c6d57273be9..cff2cbbeae8c 100644 --- a/pkgs/os-specific/linux/virtio_vmmci/default.nix +++ b/pkgs/os-specific/linux/virtio_vmmci/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "virtio_vmmci"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "voutilad"; repo = "virtio_vmmci"; rev = version; - hash = "sha256-ZHslYYZFjM3wp0W5J3/WwCtQ2wDzT1jNc26Z/giTC8g="; + hash = "sha256-dMh6bqlhsp/cWKqiJ9xjVI9yJj2w1ap7agKSnRjadXA="; }; hardeningDisable = [ "pic" "format" ]; From 7ad32769f4a5789eda30611c52785da7115d2cd5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Feb 2024 07:59:34 +0000 Subject: [PATCH 057/160] postgresql15JitPackages.pg_net: 0.7.3 -> 0.8.0 --- pkgs/servers/sql/postgresql/ext/pg_net.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_net.nix b/pkgs/servers/sql/postgresql/ext/pg_net.nix index 3cfcafad74e7..e46fc8f50daf 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_net.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_net.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pg_net"; - version = "0.7.3"; + version = "0.8.0"; buildInputs = [ curl postgresql ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "supabase"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-j5qLgn/i4ljysuwgT46579N+9VpGr483vQEX/3lUYFA="; + hash = "sha256-ZPsRPWV1G3lMM2mT+H139Wvgoy8QnmeUbzEnGeDJmZA="; }; installPhase = '' From 3bb3711ded9942b2ba152e34a72aedb1e42345fd Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 24 Feb 2024 08:00:00 +0000 Subject: [PATCH 058/160] postgresqlPackages.pg_net: fix build with gcc --- pkgs/servers/sql/postgresql/ext/pg_net.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/sql/postgresql/ext/pg_net.nix b/pkgs/servers/sql/postgresql/ext/pg_net.nix index e46fc8f50daf..8ef3182ebeb6 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_net.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_net.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { hash = "sha256-ZPsRPWV1G3lMM2mT+H139Wvgoy8QnmeUbzEnGeDJmZA="; }; + env.NIX_CFLAGS_COMPILE = "-Wno-error"; + installPhase = '' mkdir -p $out/{lib,share/postgresql/extension} From d7ac731140159e8a6e1d275b7d4c7c88f95d6c44 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 24 Feb 2024 12:31:12 +0100 Subject: [PATCH 059/160] pyload-ng: drop removal of `Flask-Session2` in the `setup.cfg` It has been removed by upstream we do not need this change anymore. --- pkgs/applications/networking/pyload-ng/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/networking/pyload-ng/default.nix b/pkgs/applications/networking/pyload-ng/default.nix index c9f00d3fb76f..09304784d312 100644 --- a/pkgs/applications/networking/pyload-ng/default.nix +++ b/pkgs/applications/networking/pyload-ng/default.nix @@ -21,8 +21,6 @@ python3.pkgs.buildPythonApplication rec { postPatch = '' # relax version bounds sed -i 's/\([A-z0-9]*\)~=.*$/\1/' setup.cfg - # not sure what Flask-Session2 is but flask-session works just fine - sed -i '/Flask-Session2/d' setup.cfg ''; propagatedBuildInputs = with python3.pkgs; [ From e2f81c0f30ec12071af7afa9d9d70f20b2e816e1 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 24 Feb 2024 14:39:04 +0100 Subject: [PATCH 060/160] zabbix50: 5.0.37 -> 5.0.41 Fixes CVE-2024-22119 / https://support.zabbix.com/browse/ZBX-24070 Changes: https://www.zabbix.com/rn/rn5.0.41 https://www.zabbix.com/rn/rn5.0.40 https://www.zabbix.com/rn/rn5.0.39 https://www.zabbix.com/rn/rn5.0.38 --- pkgs/servers/monitoring/zabbix/agent.nix | 4 ++-- pkgs/servers/monitoring/zabbix/agent2.nix | 4 ++-- pkgs/servers/monitoring/zabbix/proxy.nix | 4 ++-- pkgs/servers/monitoring/zabbix/server.nix | 4 ++-- pkgs/servers/monitoring/zabbix/versions.nix | 8 ++++---- pkgs/servers/monitoring/zabbix/web.nix | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/servers/monitoring/zabbix/agent.nix b/pkgs/servers/monitoring/zabbix/agent.nix index 4aaeb9f103d6..3f1d80ca4df9 100644 --- a/pkgs/servers/monitoring/zabbix/agent.nix +++ b/pkgs/servers/monitoring/zabbix/agent.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchurl, pkg-config, libiconv, openssl, pcre }: -import ./versions.nix ({ version, sha256, ... }: +import ./versions.nix ({ version, hash, ... }: stdenv.mkDerivation { pname = "zabbix-agent"; inherit version; src = fetchurl { url = "https://cdn.zabbix.com/zabbix/sources/stable/${lib.versions.majorMinor version}/zabbix-${version}.tar.gz"; - inherit sha256; + inherit hash; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/monitoring/zabbix/agent2.nix b/pkgs/servers/monitoring/zabbix/agent2.nix index 718522c8fccf..374a137297f1 100644 --- a/pkgs/servers/monitoring/zabbix/agent2.nix +++ b/pkgs/servers/monitoring/zabbix/agent2.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchurl, autoreconfHook, pkg-config, libiconv, openssl, pcre, zlib }: -import ./versions.nix ({ version, sha256, vendorHash ? throw "unsupported version ${version} for zabbix-agent2", ... }: +import ./versions.nix ({ version, hash, vendorHash ? throw "unsupported version ${version} for zabbix-agent2", ... }: buildGoModule { pname = "zabbix-agent2"; inherit version; src = fetchurl { url = "https://cdn.zabbix.com/zabbix/sources/stable/${lib.versions.majorMinor version}/zabbix-${version}.tar.gz"; - inherit sha256; + inherit hash; }; modRoot = "src/go"; diff --git a/pkgs/servers/monitoring/zabbix/proxy.nix b/pkgs/servers/monitoring/zabbix/proxy.nix index f9088e682bdb..b287ef56c76f 100644 --- a/pkgs/servers/monitoring/zabbix/proxy.nix +++ b/pkgs/servers/monitoring/zabbix/proxy.nix @@ -15,14 +15,14 @@ assert sqliteSupport -> !mysqlSupport && !postgresqlSupport; let inherit (lib) optional optionalString; in - import ./versions.nix ({ version, sha256, ... }: + import ./versions.nix ({ version, hash, ... }: stdenv.mkDerivation { pname = "zabbix-proxy"; inherit version; src = fetchurl { url = "https://cdn.zabbix.com/zabbix/sources/stable/${lib.versions.majorMinor version}/zabbix-${version}.tar.gz"; - inherit sha256; + inherit hash; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/monitoring/zabbix/server.nix b/pkgs/servers/monitoring/zabbix/server.nix index 3cffedd5aeb0..5abf6a93d55d 100644 --- a/pkgs/servers/monitoring/zabbix/server.nix +++ b/pkgs/servers/monitoring/zabbix/server.nix @@ -16,14 +16,14 @@ assert postgresqlSupport -> !mysqlSupport; let inherit (lib) optional optionalString; in - import ./versions.nix ({ version, sha256, ... }: + import ./versions.nix ({ version, hash, ... }: stdenv.mkDerivation { pname = "zabbix-server"; inherit version; src = fetchurl { url = "https://cdn.zabbix.com/zabbix/sources/stable/${lib.versions.majorMinor version}/zabbix-${version}.tar.gz"; - inherit sha256; + inherit hash; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix index cf4d9bc8508b..a106edbf9056 100644 --- a/pkgs/servers/monitoring/zabbix/versions.nix +++ b/pkgs/servers/monitoring/zabbix/versions.nix @@ -1,13 +1,13 @@ generic: { v60 = generic { version = "6.0.21"; - sha256 = "sha256-hdKPI5UEQvF/URH2eLWW32az3LMEse3UXIELOsfvwzk="; + hash = "sha256-hdKPI5UEQvF/URH2eLWW32az3LMEse3UXIELOsfvwzk="; vendorHash = null; }; v50 = generic { - version = "5.0.37"; - sha256 = "sha256-+C5fI+eMJKsynVnVJIYj27x1iFQwaG9Fnho0BXgENQI="; - vendorHash = "sha256-oSZBzIUL1yHXk7PnkSAlhI0i89aGMFrFHmbMN9rDAJ0="; + version = "5.0.41"; + hash = "sha256-pPvw0lPoK1IpsXc5c8Qu9zFhx2oHJz2bwiX80vrYa58="; + vendorHash = "sha256-qLDoNnEFiSrWXbLtYlmQaqY8Rv6JaG8WbMYBlry5Evc="; }; } diff --git a/pkgs/servers/monitoring/zabbix/web.nix b/pkgs/servers/monitoring/zabbix/web.nix index cbd095e234cc..7267e3046dd7 100644 --- a/pkgs/servers/monitoring/zabbix/web.nix +++ b/pkgs/servers/monitoring/zabbix/web.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchurl, writeText }: -import ./versions.nix ({ version, sha256, ... }: +import ./versions.nix ({ version, hash, ... }: stdenv.mkDerivation rec { pname = "zabbix-web"; inherit version; src = fetchurl { url = "https://cdn.zabbix.com/zabbix/sources/stable/${lib.versions.majorMinor version}/zabbix-${version}.tar.gz"; - inherit sha256; + inherit hash; }; phpConfig = writeText "zabbix.conf.php" '' From 01134358a0b3fe2792204bb61098a6b592fc6348 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 24 Feb 2024 14:52:07 +0100 Subject: [PATCH 061/160] zabbix60: 6.0.21 -> 6.0.26 Fixes CVE-2024-22119 / https://support.zabbix.com/browse/ZBX-24070 Changes: https://www.zabbix.com/rn/rn6.0.26 https://www.zabbix.com/rn/rn6.0.25 https://www.zabbix.com/rn/rn6.0.24 https://www.zabbix.com/rn/rn6.0.23 https://www.zabbix.com/rn/rn6.0.22 --- pkgs/servers/monitoring/zabbix/versions.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix index a106edbf9056..6fe89a17c357 100644 --- a/pkgs/servers/monitoring/zabbix/versions.nix +++ b/pkgs/servers/monitoring/zabbix/versions.nix @@ -1,7 +1,7 @@ generic: { v60 = generic { - version = "6.0.21"; - hash = "sha256-hdKPI5UEQvF/URH2eLWW32az3LMEse3UXIELOsfvwzk="; + version = "6.0.26"; + hash = "sha256-MIOKe5hqfDecB1oWZKzbFmJCsQLuAGtp21l2WxxVG+g="; vendorHash = null; }; From 3ec2275f08950e9e51fe1b26224bfb2932df5ee4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 24 Feb 2024 16:05:24 +0100 Subject: [PATCH 062/160] python311Packages.orbax-checkpoint: init at 0.5.3 Orbax provides common utility libraries for JAX users https://github.com/google/orbax/tree/main/checkpoint --- .../orbax-checkpoint/default.nix | 78 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 80 insertions(+) create mode 100644 pkgs/development/python-modules/orbax-checkpoint/default.nix diff --git a/pkgs/development/python-modules/orbax-checkpoint/default.nix b/pkgs/development/python-modules/orbax-checkpoint/default.nix new file mode 100644 index 000000000000..0f9d467335ce --- /dev/null +++ b/pkgs/development/python-modules/orbax-checkpoint/default.nix @@ -0,0 +1,78 @@ +{ lib +, absl-py +, buildPythonPackage +, cached-property +, etils +, fetchPypi +, flit-core +, importlib-resources +, jax +, jaxlib +, msgpack +, nest-asyncio +, numpy +, protobuf +, pytest-xdist +, pytestCheckHook +, pythonOlder +, pyyaml +, tensorstore +, typing-extensions +}: + +buildPythonPackage rec { + pname = "orbax-checkpoint"; + version = "0.5.3"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchPypi { + pname = "orbax_checkpoint"; + inherit version; + hash = "sha256-FXKQTLv+hROSfg2A+AtzDg7y9oAzLTwoENhENTKTi0U="; + }; + + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ + absl-py + cached-property + etils + importlib-resources + jax + jaxlib + msgpack + nest-asyncio + numpy + protobuf + pyyaml + tensorstore + typing-extensions + ]; + + nativeCheckInputs = [ + pytest-xdist + pytestCheckHook + ]; + + pythonImportsCheck = [ + "orbax" + ]; + + disabledTestPaths = [ + # Circular dependency flax + "orbax/checkpoint/transform_utils_test.py" + "orbax/checkpoint/utils_test.py" + ]; + + meta = with lib; { + description = "Orbax provides common utility libraries for JAX users"; + homepage = "https://github.com/google/orbax/tree/main/checkpoint"; + changelog = "https://github.com/google/orbax/blob/${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b50984ad81ce..8f3be68d30a5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8932,6 +8932,8 @@ self: super: with self; { oras = callPackage ../development/python-modules/oras { }; + orbax-checkpoint = callPackage ../development/python-modules/orbax-checkpoint { }; + orderedmultidict = callPackage ../development/python-modules/orderedmultidict { }; ordered-set = callPackage ../development/python-modules/ordered-set { }; From ac28fe9db833aef9f6b13eef4f0e74b16ae2196a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Feb 2024 15:07:58 +0000 Subject: [PATCH 063/160] kid3: 3.9.4 -> 3.9.5 --- pkgs/applications/audio/kid3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix index 060f2244f2a9..1aa79a69e523 100644 --- a/pkgs/applications/audio/kid3/default.nix +++ b/pkgs/applications/audio/kid3/default.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "kid3"; - version = "3.9.4"; + version = "3.9.5"; src = fetchurl { url = "mirror://kde/stable/kid3/${finalAttrs.version}/kid3-${finalAttrs.version}.tar.xz"; - hash = "sha256-xBCWDpYiXeChxIiMPqHG3CyiRau2kUdDJtzcPtvWpSA="; + hash = "sha256-pCT+3eNcF247RDNEIqrUOEhBh3LaAgdR0A0IdOXOgUU="; }; nativeBuildInputs = [ From 0976e3b30cccbc205083e97a59be0ce07476cf67 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Feb 2024 15:53:47 +0000 Subject: [PATCH 064/160] python312Packages.clarifai-grpc: 10.1.4 -> 10.1.6 --- pkgs/development/python-modules/clarifai-grpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/clarifai-grpc/default.nix b/pkgs/development/python-modules/clarifai-grpc/default.nix index 33087975cf81..92008f65d9be 100644 --- a/pkgs/development/python-modules/clarifai-grpc/default.nix +++ b/pkgs/development/python-modules/clarifai-grpc/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "clarifai-grpc"; - version = "10.1.4"; + version = "10.1.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Clarifai"; repo = "clarifai-python-grpc"; rev = "refs/tags/${version}"; - hash = "sha256-cYYAEen/RY5TG2jLxUS38Acehg/X8pni6T1zxhJAi1Y="; + hash = "sha256-VRI4mAYWJUP9kxf+xOlcys07Jsa7Zy9bP8BDKDEYli4="; }; nativeBuildInputs = [ From 1198e9d8ac71eb038a8daa4a79c2a15334805810 Mon Sep 17 00:00:00 2001 From: Kiskae Date: Fri, 23 Feb 2024 19:04:22 +0100 Subject: [PATCH 065/160] linuxPackages.nvidiaPackages.legacy_470: 470.223.02 -> 470.239.06 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index b8fcffd35f37..cf6ea198948c 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -117,13 +117,11 @@ rec { # Last one supporting Kepler architecture legacy_470 = generic { - version = "470.223.02"; - sha256_64bit = "sha256-s2hi1TNsw+br6Ow6tPiFsYPaJY8d+x4FrkBrP2xNRPg="; - sha256_aarch64 = "sha256-CFkg2ARlGWqlFQKm8SlbwMH6eLidHKA/q5QGVOpPGuU="; - settingsSha256 = "sha256-r6DuIH/rnsCm/y51iRgPNi5/kz+EFMVABREdTjBneZ0="; - persistencedSha256 = "sha256-e71fpPBBv8S/aoeXxBXkzKy5bsMMbv8y024cSLc8DYc="; - - patches = [ rcu_patch ]; + version = "470.239.06"; + sha256_64bit = "sha256-fXTKrBQKBDLXnr6OQzDceW85un3UCz/NYd92AYG/nMw="; + sha256_aarch64 = "sha256-NZj8OLQ0N7y3V7UBamLyJE8AbI3alZJD1weNjnssuNs="; + settingsSha256 = "sha256-2YTk6DaoB8Qvob9/ohtHXuDhxGO9O/SUwlXXbLSgJP0="; + persistencedSha256 = "sha256-wLrkfD8MQ8sMODE+yEnWg/1ETxYVWOqNsIj1dY+5yjc="; }; # Last one supporting x86 From 0890b915927456ef55a134d57d12e9661100745f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Feb 2024 16:50:35 +0000 Subject: [PATCH 066/160] python312Packages.ytmusicapi: 1.5.2 -> 1.5.3 --- pkgs/development/python-modules/ytmusicapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ytmusicapi/default.nix b/pkgs/development/python-modules/ytmusicapi/default.nix index 700a250130aa..74b1d8ac5e81 100644 --- a/pkgs/development/python-modules/ytmusicapi/default.nix +++ b/pkgs/development/python-modules/ytmusicapi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ytmusicapi"; - version = "1.5.2"; + version = "1.5.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "sigma67"; repo = "ytmusicapi"; rev = "refs/tags/${version}"; - hash = "sha256-3dJ9Mu1cblBJh3BVEyxdfO+RD8kSxpdvnvox7ljMWT4="; + hash = "sha256-X4bfGYFttuEMwDyjqzDe3RJGkAvVUs91hEL0JfXrdIM="; }; nativeBuildInputs = [ From 10d8dc5df7ac6b8046bfb6a3aab4d827b891705d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Feb 2024 17:07:37 +0000 Subject: [PATCH 067/160] python312Packages.puremagic: 1.20 -> 1.21 --- pkgs/development/python-modules/puremagic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/puremagic/default.nix b/pkgs/development/python-modules/puremagic/default.nix index 453cbd96cde6..72f0dfc4dde7 100644 --- a/pkgs/development/python-modules/puremagic/default.nix +++ b/pkgs/development/python-modules/puremagic/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "puremagic"; - version = "1.20"; + version = "1.21"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "cdgriffith"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Iyf/Vf1uqdtHlaP9Petpp88aIGCGmHu//cH6bindL6c="; + hash = "sha256-ObJp3+gk1tf1+9wBpvzs0wwP7ptDlfGwX9b4wlCb1RI="; }; nativeCheckInputs = [ From fe5888a64a618bc55ebe9ef98987b2086ae1e9b2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Feb 2024 17:20:12 +0000 Subject: [PATCH 068/160] srm-cuarzo: 0.5.2-1 -> 0.5.3-1 --- pkgs/by-name/sr/srm-cuarzo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sr/srm-cuarzo/package.nix b/pkgs/by-name/sr/srm-cuarzo/package.nix index 9c77d755d5b9..71aeb8e31601 100644 --- a/pkgs/by-name/sr/srm-cuarzo/package.nix +++ b/pkgs/by-name/sr/srm-cuarzo/package.nix @@ -14,9 +14,9 @@ }: stdenv.mkDerivation (self: { pname = "srm-cuarzo"; - version = "0.5.2-1"; + version = "0.5.3-1"; rev = "v${self.version}"; - hash = "sha256-FMd1v0K+H7DlSD0osmWrnuSKqQZxw3RUZq8JwZFm/f4="; + hash = "sha256-KRp+rTpiUbOmUPE9vASwTF+c8TDveFnAEqptcGO5luc="; src = fetchFromGitHub { inherit (self) rev hash; From e5c6e8bc819f7686c4c812ca56be488ca869c49a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Feb 2024 18:29:04 +0000 Subject: [PATCH 069/160] arkade: 0.11.1 -> 0.11.2 --- pkgs/applications/networking/cluster/arkade/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/applications/networking/cluster/arkade/default.nix index a8f2c5050ae5..0dc15c103291 100644 --- a/pkgs/applications/networking/cluster/arkade/default.nix +++ b/pkgs/applications/networking/cluster/arkade/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "arkade"; - version = "0.11.1"; + version = "0.11.2"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - hash = "sha256-DsKc+AT+0vIaJftBFLqVXx/CJRNNgE/vzSxlHkCSJaI="; + hash = "sha256-G8zWPz5pTDjfZJ8DtY1DQRGYMOsGhNXWZEgFYKM/y6I="; }; CGO_ENABLED = 0; From 9dab6dd095a9ffec9981f2e213826b531452154d Mon Sep 17 00:00:00 2001 From: Dennis Wuitz Date: Sat, 24 Feb 2024 19:47:22 +0100 Subject: [PATCH 070/160] papermc: 1.20.2.234 -> 1.20.4.435 --- pkgs/games/papermc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/papermc/default.nix b/pkgs/games/papermc/default.nix index 20861779185c..aa16e51a7ac8 100644 --- a/pkgs/games/papermc/default.nix +++ b/pkgs/games/papermc/default.nix @@ -7,7 +7,7 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "papermc"; - version = "1.20.2.234"; + version = "1.20.4.435"; src = let @@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { in fetchurl { url = "https://papermc.io/api/v2/projects/paper/versions/${mcVersion}/builds/${buildNum}/downloads/paper-${mcVersion}-${buildNum}.jar"; - hash = "sha256-fR7Dq09iFGVXodQjrS7Hg4NcrKPJbNg0hexU520JC6c="; + hash = "sha256-NrIsYLoAAWORw/S26NDFjYBVwpNITJxuWGZow3696wM="; }; installPhase = '' From bb5a6755de92b06495da4e6eb5a4d9760ba5082d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Feb 2024 19:09:54 +0000 Subject: [PATCH 071/160] python311Packages.python-homewizard-energy: 4.3.0 -> 4.3.1 --- .../python-modules/python-homewizard-energy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-homewizard-energy/default.nix b/pkgs/development/python-modules/python-homewizard-energy/default.nix index 66d97a4b33b9..20bd7409f6cd 100644 --- a/pkgs/development/python-modules/python-homewizard-energy/default.nix +++ b/pkgs/development/python-modules/python-homewizard-energy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "python-homewizard-energy"; - version = "4.3.0"; + version = "4.3.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "DCSBL"; repo = "python-homewizard-energy"; rev = "refs/tags/v${version}"; - hash = "sha256-5e2PzH+kDOopH4LYOq49SlHsfBbZZk60U1BSN8OnrKI="; + hash = "sha256-LpxXTzUb+N15lGno3pAhRSEJCb4NmwBcGQ/PshI9gYA="; }; postPatch = '' From 45c58a9b9228963e8159b9cabf1e37c00c04e009 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Feb 2024 19:37:31 +0000 Subject: [PATCH 072/160] gimoji: 0.7.3 -> 0.7.6 --- pkgs/applications/misc/gimoji/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/gimoji/default.nix b/pkgs/applications/misc/gimoji/default.nix index e16d7312f5df..13d9a94b9873 100644 --- a/pkgs/applications/misc/gimoji/default.nix +++ b/pkgs/applications/misc/gimoji/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "gimoji"; - version = "0.7.3"; + version = "0.7.6"; src = fetchFromGitHub { owner = "zeenix"; repo = "gimoji"; rev = version; - hash = "sha256-xQ02jmPuu1IHkQCCJn2FVPcJRbwN+k8FhsZyDX0oHaw="; + hash = "sha256-ipsEFZGC3JYOeNVI4AUb2c/9tt+TTIbeXuJ15ShEH6U="; }; - cargoHash = "sha256-DSLIH6swVQXHrqKBxlrhNTG5maRmUi6Ndmuuv0Vo3Ak="; + cargoHash = "sha256-786OPEaIHQtgUHlkjLprKfJ7VoeSW+IzHto3XXZ6Fu8="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppKit From b728bbf9382d7d779268362ccaac4bfebf615879 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Feb 2024 19:39:03 +0000 Subject: [PATCH 073/160] asn: 0.75.3 -> 0.76.0 --- pkgs/applications/networking/asn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/asn/default.nix b/pkgs/applications/networking/asn/default.nix index 4fc231b4702c..ddd9c1d34c32 100644 --- a/pkgs/applications/networking/asn/default.nix +++ b/pkgs/applications/networking/asn/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "asn"; - version = "0.75.3"; + version = "0.76.0"; src = fetchFromGitHub { owner = "nitefood"; repo = "asn"; rev = "refs/tags/v${version}"; - hash = "sha256-KOwXOGw6gv8YFTrFFkD6BNKChTIbD2Soy3gvvSzNQgM="; + hash = "sha256-pdtRf9VKEdNg1UeYSaLNLm9O057dT+n5g3Dd0bcP4EI="; }; nativeBuildInputs = [ From d8e76e5d6b9a4fd20ad71462d7380ec6c7160f25 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 24 Feb 2024 15:46:33 -0500 Subject: [PATCH 074/160] nvchecker: 2.12 -> 2.13.1 Diff: https://github.com/lilydjwg/nvchecker/compare/v2.12...v2.13.1 Changelog: https://github.com/lilydjwg/nvchecker/releases/tag/v2.13.1 --- .../python-modules/nvchecker/default.nix | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/nvchecker/default.nix b/pkgs/development/python-modules/nvchecker/default.nix index ca327c3e54e0..b375d6111ae0 100644 --- a/pkgs/development/python-modules/nvchecker/default.nix +++ b/pkgs/development/python-modules/nvchecker/default.nix @@ -1,12 +1,10 @@ { lib -, aiohttp , platformdirs , buildPythonPackage , docutils , fetchFromGitHub , flaky , installShellFiles -, packaging , pycurl , pytest-asyncio , pytest-httpbin @@ -20,31 +18,29 @@ buildPythonPackage rec { pname = "nvchecker"; - version = "2.12"; - format = "pyproject"; + version = "2.13.1"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "lilydjwg"; repo = pname; rev = "v${version}"; - hash = "sha256-6mhVDC2jpIIOZeoKz4AxxU7jj8dqPVBKRWupbuY/T7E="; + hash = "sha256-q+az9oaxxIOv/vLFpkT3cF5GDJsa0Cid4oPWEKg5s7M="; }; nativeBuildInputs = [ + setuptools docutils installShellFiles ]; propagatedBuildInputs = [ - aiohttp - platformdirs - packaging - pycurl - setuptools structlog + platformdirs tornado + pycurl ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; From 8bc40ff57e69c3f54d9f6512a4b5bce6e8744b57 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Feb 2024 21:02:06 +0000 Subject: [PATCH 075/160] bonsai: 1.0.2 -> 1.1.0 --- pkgs/by-name/bo/bonsai/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bo/bonsai/package.nix b/pkgs/by-name/bo/bonsai/package.nix index da5f81c928d5..6c5d9adb78b5 100644 --- a/pkgs/by-name/bo/bonsai/package.nix +++ b/pkgs/by-name/bo/bonsai/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "bonsai"; - version = "1.0.2"; + version = "1.1.0"; src = fetchFromSourcehut { owner = "~stacyharper"; repo = "bonsai"; rev = "v${finalAttrs.version}"; - hash = "sha256-Yosf07KUOQv4O5111tLGgI270g0KVGwzdTPtPOsTcP8="; + hash = "sha256-Wsr76OQOIqRPCx/8GK9NovxxPZ3dEP8pSo8wgMK1Hfo="; }; nativeBuildInputs = [ From cccb07297dbb7318831a90a7acd8926922063243 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Feb 2024 21:19:25 +0000 Subject: [PATCH 076/160] rspamd: 3.8.2 -> 3.8.3 --- pkgs/servers/mail/rspamd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix index c63fe4a2c17c..4cd063df9df2 100644 --- a/pkgs/servers/mail/rspamd/default.nix +++ b/pkgs/servers/mail/rspamd/default.nix @@ -27,13 +27,13 @@ assert withHyperscan -> stdenv.isx86_64; stdenv.mkDerivation rec { pname = "rspamd"; - version = "3.8.2"; + version = "3.8.3"; src = fetchFromGitHub { owner = "rspamd"; repo = "rspamd"; rev = version; - hash = "sha256-02Ykj4qo821iJa4AqS3XfSBm1nqBxRKC2IgTgbdiRss="; + hash = "sha256-LX37HE4xr3tJqAXBDbi2O8N9tt8DazslIfmqG9hNiKw="; }; hardeningEnable = [ "pie" ]; From 2b9c0857c8d803fce34b37baeef7c22295fad3ab Mon Sep 17 00:00:00 2001 From: happysalada Date: Sat, 24 Feb 2024 16:26:55 -0500 Subject: [PATCH 077/160] helix-gpt: 0.27 -> 0.28 --- pkgs/by-name/he/helix-gpt/pin.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/he/helix-gpt/pin.json b/pkgs/by-name/he/helix-gpt/pin.json index 7d355f743953..d79aad46aba1 100644 --- a/pkgs/by-name/he/helix-gpt/pin.json +++ b/pkgs/by-name/he/helix-gpt/pin.json @@ -1,7 +1,7 @@ { - "version": "0.27", - "srcHash": "sha256-sGkK3SaQmzprgTiABgKfRZ3pUNFZNrt/8aNANH1RES8=", + "version": "0.28", + "srcHash": "sha256-vOXY8B5CRCEQX/NnBVNwmyRKSeDSliurClRPiJIAD3Y=", "x86_64-linux": "sha256-h6wGkOfSbB8Rwm7eFvcowDdH1RdS6eFaxgf+SdYvYt8=", - "x86_64-darwin": "sha256-A8T1FNPS1CguSmRyGl+i0o/DGy+LyTnKYKdNc8kTKS8=", - "aarch64-darwin": "sha256-A8T1FNPS1CguSmRyGl+i0o/DGy+LyTnKYKdNc8kTKS8=" + "x86_64-darwin": "sha256-lkURZs6nQpsZ7SGX+eLoBEXa9VdTQP795iHAGYyRaVs=", + "aarch64-darwin": "sha256-lkURZs6nQpsZ7SGX+eLoBEXa9VdTQP795iHAGYyRaVs=" } From 5dbc79c15828c90448d6ba56c8dbcb8b82bf315e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Feb 2024 22:06:22 +0000 Subject: [PATCH 078/160] python311Packages.oslo-context: 5.3.0 -> 5.4.0 --- pkgs/development/python-modules/oslo-context/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oslo-context/default.nix b/pkgs/development/python-modules/oslo-context/default.nix index 902c244c488b..b9f831ce00e5 100644 --- a/pkgs/development/python-modules/oslo-context/default.nix +++ b/pkgs/development/python-modules/oslo-context/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "oslo.context"; - version = "5.3.0"; + version = "5.4.0"; src = fetchPypi { inherit pname version; - hash = "sha256-xRBxQcYotq5W1P62MiucSnAJL9ahgekfq+relKCeTjg="; + hash = "sha256-6WSRu91rUecqOoxUahKbhNI56OngtSEMi6fAoKVimRk="; }; postPatch = '' From 6a0c4fbe04238867c3a6593da3b34294d07f37da Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Feb 2024 22:12:59 +0000 Subject: [PATCH 079/160] lubelogger: 1.2.1 -> 1.2.2 --- pkgs/by-name/lu/lubelogger/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lu/lubelogger/package.nix b/pkgs/by-name/lu/lubelogger/package.nix index 33c6214f4e72..386cddb9a7bd 100644 --- a/pkgs/by-name/lu/lubelogger/package.nix +++ b/pkgs/by-name/lu/lubelogger/package.nix @@ -6,13 +6,13 @@ buildDotnetModule rec { pname = "lubelogger"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "hargata"; repo = "lubelog"; rev = "v${version}"; - hash = "sha256-YxP8XmjYqxuTA2fIV1q7GBsrWPtLr02KkFl4UUNJ2p8="; + hash = "sha256-eH8BWTUTzmVTOnn5svSfk8hqf8CjIpQdxoknlkgjVDY="; }; projectFile = "CarCareTracker.sln"; From ea75af1af5e7ae2c21d13d6e6994e2561a3ef25f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Feb 2024 22:17:12 +0000 Subject: [PATCH 080/160] notepad-next: 0.6.4 -> 0.7 --- pkgs/applications/editors/notepad-next/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/notepad-next/default.nix b/pkgs/applications/editors/notepad-next/default.nix index 2f668a6fc526..2b6502023c9a 100644 --- a/pkgs/applications/editors/notepad-next/default.nix +++ b/pkgs/applications/editors/notepad-next/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "notepad-next"; - version = "0.6.4"; + version = "0.7"; src = fetchFromGitHub { owner = "dail8859"; repo = "NotepadNext"; rev = "v${version}"; - sha256 = "sha256-m8+kM9uz3gJ3kvpgZdoonSvYlh/f1WiGZlB8JKMTXh4="; + sha256 = "sha256-I2bS8oT/TGf6fuXpTwOKo2MaUo0jLFIU/DfW9h1toOk="; # External dependencies - https://github.com/dail8859/NotepadNext/issues/135 fetchSubmodules = true; }; From b4e6152dc572e167b4b0e7f24aa6f6f482c017ef Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 24 Feb 2024 22:44:20 +0000 Subject: [PATCH 081/160] starspace: mark broken THe build fails against `zlib-1.3` in `master` as https://hydra.nixos.org/build/249158742: 3rdparty/zlib.h:1468:32: error: expected initializer before 'Z_ARG' 1468 | ZEXTERN int ZEXPORTVA gzprintf Z_ARG((gzFile file, const char *format, ...)); | ^~~~~ The upstream repository did not see updates for past 5 years and is archived. Let's schedule it for removal. --- .../science/machine-learning/starspace/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/science/machine-learning/starspace/default.nix b/pkgs/applications/science/machine-learning/starspace/default.nix index ab0c10efebce..f4ca74ef5bbf 100644 --- a/pkgs/applications/science/machine-learning/starspace/default.nix +++ b/pkgs/applications/science/machine-learning/starspace/default.nix @@ -28,6 +28,9 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + # Does not build against gcc-13. No development activity upstream + # for past few years. + broken = true; description = "General-purpose neural model for efficient learning of entity embeddings"; homepage = "https://ai.facebook.com/tools/starspace/"; license = licenses.mit; From d50536f875b6cfaa0ee7d8c9b83206ea0c866b4a Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 24 Feb 2024 22:51:02 +0000 Subject: [PATCH 082/160] srsran: fix `gcc-13` build Without the change build fails on `master` as https://hydra.nixos.org/build/250334809: In file included from /build/source/srsue/hdr/phy/phy_metrics.h:26, from /build/source/srsue/hdr/phy/phy_common.h:25, from /build/source/srsue/src/phy/phy_common.cc:26: In member function 'std::array<_Tp, _Nm>::value_type& std::array<_Tp, _Nm>::operator[](size_type) [with _Tp = float; long unsigned int _Nm = 5]', inlined from 'void srsue::phy_common::reset_measurements(uint32_t)' at /build/source/srsue/src/phy/phy_common.cc:662:18, inlined from 'void srsue::phy_common::reset()' at /build/source/srsue/src/phy/phy_common.cc:918:21: /nix/store/qs1nwzbp2ml3cxzsxihn82hl0w73snr0-gcc-13.2.0/include/c++/13.2.0/array:203:24: error: array subscript 5 is above array bounds of 'std::__array_traits::_Type' {aka 'float [5]'} [-Werror=array-bounds=] 203 | return _M_elems[__n]; | ~~~~~~~~^ Blanket `-Werror` is prone to build failures on newer toolchains. Disable it via exposed `cmake` configure knob. --- pkgs/applications/radio/srsran/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/radio/srsran/default.nix b/pkgs/applications/radio/srsran/default.nix index a6745d2c406c..5d03f9bcfdfb 100644 --- a/pkgs/applications/radio/srsran/default.nix +++ b/pkgs/applications/radio/srsran/default.nix @@ -41,6 +41,8 @@ stdenv.mkDerivation rec { zeromq ]; + cmakeFlags = [ "-DENABLE_WERROR=OFF" ]; + meta = with lib; { homepage = "https://www.srslte.com/"; description = "Open-source 4G and 5G software radio suite."; From 4a917561755db5f23a6c11cbb5b118bf7b383977 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Feb 2024 23:22:20 +0000 Subject: [PATCH 083/160] python312Packages.pynuki: 1.6.2 -> 1.6.3 --- pkgs/development/python-modules/pynuki/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pynuki/default.nix b/pkgs/development/python-modules/pynuki/default.nix index 67c35da58218..9a6d57b96d77 100644 --- a/pkgs/development/python-modules/pynuki/default.nix +++ b/pkgs/development/python-modules/pynuki/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pynuki"; - version = "1.6.2"; + version = "1.6.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pschmitt"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-I0eAhgThSBEmJF6mYw+0Bh1kCUqEMFnCx+4n7l3Hf14="; + hash = "sha256-PF5FmAuPcJXq8gQ8HyzdtL2HiiUjueT+LAS1lYRvrwM="; }; nativeBuildInputs = [ From 7af74ee4f3c369cc4272d7435430a5b0cbf9270c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Feb 2024 23:38:50 +0000 Subject: [PATCH 084/160] typos-lsp: 0.1.12 -> 0.1.13 --- pkgs/by-name/ty/typos-lsp/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ty/typos-lsp/package.nix b/pkgs/by-name/ty/typos-lsp/package.nix index b1fafeb70158..0c0cccb21095 100644 --- a/pkgs/by-name/ty/typos-lsp/package.nix +++ b/pkgs/by-name/ty/typos-lsp/package.nix @@ -4,16 +4,16 @@ }: rustPlatform.buildRustPackage rec { pname = "typos-lsp"; - version = "0.1.12"; + version = "0.1.13"; src = fetchFromGitHub { owner = "tekumara"; repo = "typos-lsp"; rev = "refs/tags/v${version}"; - hash = "sha256-LzemgHVCuLkLaJyyrJhIsOOn+OnYuiJsMSxITNz6R8g="; + hash = "sha256-2nNOUeuDDBi7Ak7ATKYyRqmGwebk0JqIdHN6GV+v+aA="; }; - cargoHash = "sha256-LFRg/Y/nudrdPw/o3WUH6aM+ThE8N/HII5J0Ikid8GI="; + cargoHash = "sha256-hQoxaavR4cefmpr+znXOs1OFJJ83mGk4TidFf13l7Ho="; # fix for compilation on aarch64 # see https://github.com/NixOS/nixpkgs/issues/145726 From 5bb5352541c8f332a25b4258629a443c6d5d9b21 Mon Sep 17 00:00:00 2001 From: Dietmar Winkler Date: Fri, 16 Feb 2024 14:54:10 +0100 Subject: [PATCH 085/160] vokoscreen-ng: 3.8.0 -> 4.0.0 Major update with qt6 dependency now. --- .../video/vokoscreen-ng/default.nix | 52 ++++++++----------- 1 file changed, 23 insertions(+), 29 deletions(-) diff --git a/pkgs/applications/video/vokoscreen-ng/default.nix b/pkgs/applications/video/vokoscreen-ng/default.nix index 15d59af318fb..d105849dba35 100644 --- a/pkgs/applications/video/vokoscreen-ng/default.nix +++ b/pkgs/applications/video/vokoscreen-ng/default.nix @@ -1,52 +1,46 @@ -{ lib -, mkDerivation -, fetchFromGitHub -, pkg-config -, qmake -, qttools -, gstreamer -, libX11 -, pulseaudio -, qtbase -, qtmultimedia -, qtx11extras - +{ fetchFromGitHub +, gst_all_1 +, gst-plugins-bad , gst-plugins-base , gst-plugins-good -, gst-plugins-bad , gst-plugins-ugly -, wayland +, gstreamer +, lib +, libX11 , pipewire -, wrapQtAppsHook +, pkg-config +, pulseaudio +, qt6 +, stdenv +, wayland }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "vokoscreen-ng"; - version = "3.8.0"; + version = "4.0.0"; src = fetchFromGitHub { owner = "vkohaupt"; repo = "vokoscreenNG"; rev = version; - sha256 = "sha256-4tQ/fLaAbjfc3mt2qJsW9scku/CGUs74SehDaZgLPj4="; + hash = "sha256-Y6+R18Gf3ShqhsmZ4Okx02fSOOyilS6iKU5FW9wpxvY="; }; qmakeFlags = [ "src/vokoscreenNG.pro" ]; - nativeBuildInputs = [ qttools pkg-config qmake wrapQtAppsHook ]; + nativeBuildInputs = [ qt6.qttools pkg-config qt6.qmake qt6.wrapQtAppsHook ]; buildInputs = [ - gstreamer + gst_all_1.gstreamer libX11 pulseaudio - qtbase - qtmultimedia - qtx11extras + qt6.qtbase + qt6.qtmultimedia wayland pipewire - gst-plugins-base - gst-plugins-good - gst-plugins-bad - gst-plugins-ugly + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-ugly ]; postPatch = '' @@ -67,7 +61,7 @@ mkDerivation rec { description = "User friendly Open Source screencaster for Linux and Windows"; license = licenses.gpl2Plus; homepage = "https://github.com/vkohaupt/vokoscreenNG"; - maintainers = with maintainers; [ shamilton ]; + maintainers = with maintainers; [ shamilton dietmarw ]; platforms = platforms.linux; mainProgram = "vokoscreenNG"; }; From d53ad6a7f0731f398bd5d1a3f011030c93700df5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 Feb 2024 01:00:16 +0000 Subject: [PATCH 086/160] oelint-adv: 4.3.1 -> 4.4.0 --- pkgs/by-name/oe/oelint-adv/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/oe/oelint-adv/package.nix b/pkgs/by-name/oe/oelint-adv/package.nix index 37365b48c4f3..2b1b6f5f3ad6 100644 --- a/pkgs/by-name/oe/oelint-adv/package.nix +++ b/pkgs/by-name/oe/oelint-adv/package.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "oelint-adv"; - version = "4.3.1"; + version = "4.4.0"; format = "setuptools"; src = fetchPypi { inherit version; pname = "oelint_adv"; - hash = "sha256-N8QNX6JuHVDKBLwGNwBROH8f+tcLrc1Mk21CiiOVHkI="; + hash = "sha256-Sg7qn/yZUJEJdMmaGm27kyL+fKkUsZo25eExZPOem40="; }; propagatedBuildInputs = with python3.pkgs; [ From a9bfb0a872e6d49a9ac80a181450c9a54f24b000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?AsPulse=20/=20=E3=81=82=E3=81=99=E3=81=B1=E3=82=8B?= Date: Fri, 23 Feb 2024 12:49:24 +0900 Subject: [PATCH 087/160] gh-poi: init at 0.9.8 Co-authored-by: Nikolay Korotkiy Co-authored-by: Pol Dellaiera --- pkgs/by-name/gh/gh-poi/package.nix | 33 ++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 pkgs/by-name/gh/gh-poi/package.nix diff --git a/pkgs/by-name/gh/gh-poi/package.nix b/pkgs/by-name/gh/gh-poi/package.nix new file mode 100644 index 000000000000..e10a74a1c9c1 --- /dev/null +++ b/pkgs/by-name/gh/gh-poi/package.nix @@ -0,0 +1,33 @@ +{ lib +, fetchFromGitHub +, buildGoModule +}: + +buildGoModule rec { + pname = "gh-poi"; + version = "0.9.8"; + + src = fetchFromGitHub { + owner = "seachicken"; + repo = "gh-poi"; + rev = "v${version}"; + hash = "sha256-QpUZxho9hzmgbCFgNxwwKi6hhfyqc4b/JYKH3rP4Eb8="; + }; + + ldflags = [ "-s" "-w" ]; + + vendorHash = "sha256-D/YZLwwGJWCekq9mpfCECzJyJ/xSlg7fC6leJh+e8i0="; + + # Skip checks because some of test suites require fixture. + # See: https://github.com/seachicken/gh-poi/blob/v0.9.8/.github/workflows/contract-test.yml#L28-L29 + doCheck = false; + + meta = with lib; { + changelog = "https://github.com/seachicken/gh-poi/releases/tag/${src.rev}"; + description = "GitHub CLI extension to safely clean up your local branches"; + homepage = "https://github.com/seachicken/gh-poi"; + license = licenses.mit; + maintainers = with maintainers; [ aspulse ]; + mainProgram = "gh-poi"; + }; +} From e4796838fd9ecd518b1c70c72e9f82acb55f0442 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Feb 2024 18:33:59 +0000 Subject: [PATCH 088/160] python312Packages.snakemake-interface-common: 1.17.0 -> 1.17.1 --- .../python-modules/snakemake-interface-common/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/snakemake-interface-common/default.nix b/pkgs/development/python-modules/snakemake-interface-common/default.nix index 740fd99013df..6ac47e4afede 100644 --- a/pkgs/development/python-modules/snakemake-interface-common/default.nix +++ b/pkgs/development/python-modules/snakemake-interface-common/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "snakemake-interface-common"; - version = "1.17.0"; + version = "1.17.1"; format = "pyproject"; src = fetchFromGitHub { owner = "snakemake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-1dvanwYCQE5usgXPhYCZfUpj4MyaLImQ5RskQvS6nJs="; + hash = "sha256-23PGKSBX7KMt0Q7sWiLIPfCkxr2HtBas7flYeNHABWM="; }; nativeBuildInputs = [ From 72804e76d45807664475678555447415ccb20702 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 23 Feb 2024 04:03:28 +0000 Subject: [PATCH 089/160] rivet: 3.1.9 -> 3.1.10 --- pkgs/development/libraries/physics/rivet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix index 76a4d71b38e4..a59b34147a9f 100644 --- a/pkgs/development/libraries/physics/rivet/default.nix +++ b/pkgs/development/libraries/physics/rivet/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "rivet"; - version = "3.1.9"; + version = "3.1.10"; src = fetchurl { url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2"; - hash = "sha256-9lMgRdph7rKtwgqavEFmtLLUGrLByltQDNYWuxuS57E="; + hash = "sha256-RYuODfHec46ZctJLJg6qCH3xLJnU/p3uU3fUfqakmRk="; }; latex = texliveBasic.withPackages (ps: with ps; [ From dfdf0cea5cbc4781db6584bd79459cf880caa683 Mon Sep 17 00:00:00 2001 From: Colin Date: Thu, 22 Feb 2024 22:58:34 +0000 Subject: [PATCH 090/160] icu: fix cross compilation --- pkgs/development/libraries/icu/default.nix | 17 ++--------------- pkgs/development/libraries/icu/make-icu.nix | 21 ++++++++++----------- 2 files changed, 12 insertions(+), 26 deletions(-) diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix index 7b0d295a98ea..bf595108baaf 100644 --- a/pkgs/development/libraries/icu/default.nix +++ b/pkgs/development/libraries/icu/default.nix @@ -2,64 +2,53 @@ let make-icu = (import ./make-icu.nix) { - inherit stdenv lib fetchurl fixDarwinDylibNames testers; + inherit stdenv lib buildPackages fetchurl fixDarwinDylibNames testers; }; in { icu74 = make-icu { version = "74.2"; hash = "sha256-aNsIIhKpbW9T411g9H04uWLp+dIHp0z6x4Apro/14Iw="; - nativeBuildRoot = buildPackages.icu74.override { buildRootOnly = true; }; }; icu73 = make-icu { version = "73.2"; hash = "sha256-gYqAcS7TyqzZtlIwXgGvx/oWfm8ulJltpEuQwqtgTOE="; - nativeBuildRoot = buildPackages.icu73.override { buildRootOnly = true; }; }; icu72 = make-icu { version = "72.1"; hash = "sha256-otLTghcJKn7VZjXjRGf5L5drNw4gGCrTJe3qZoGnHWg="; - nativeBuildRoot = buildPackages.icu72.override { buildRootOnly = true; }; }; icu71 = make-icu { version = "71.1"; hash = "sha256-Z6fm5R9h+vEwa2k1Mz4TssSKvY2m0vRs5q3KJLHiHr8="; - nativeBuildRoot = buildPackages.icu71.override { buildRootOnly = true; }; }; icu70 = make-icu { version = "70.1"; hash = "sha256-jSBUKMF78Tu1NTAGae0oszihV7HAGuZtMdDT4tR8P9U="; - nativeBuildRoot = buildPackages.icu70.override { buildRootOnly = true; }; }; icu69 = make-icu { version = "69.1"; hash = "sha256-TLp7es0dPELES7DBS+ZjcJjH+vKzMM6Ha8XzuRXQl0U="; - nativeBuildRoot = buildPackages.icu69.override { buildRootOnly = true; }; }; icu68 = make-icu { version = "68.2"; hash = "sha256-x5GT3uOQeiGZuClqk7UsXLdDMsJvPRZyaUh2gNR51iU="; - nativeBuildRoot = buildPackages.icu68.override { buildRootOnly = true; }; }; icu67 = make-icu { version = "67.1"; hash = "sha256-lKgM1vJRpTvSqZf28bWsZlP+eR36tm4esCJ3QPuG1dw="; - nativeBuildRoot = buildPackages.icu67.override { buildRootOnly = true; }; }; icu66 = make-icu { version = "66.1"; hash = "sha256-UqPyIJq5VVnBzwoU8kM4AB84lhW/AOJYXvPbxD7PCi4="; - nativeBuildRoot = buildPackages.icu66.override { buildRootOnly = true; }; }; icu64 = make-icu { version = "64.2"; hash = "sha256-Yn1dhHjm2W/IyQ/tSFEjkHmlYaaoueSLCJLyToLTHWw="; - nativeBuildRoot = buildPackages.icu64.override { buildRootOnly = true; }; }; icu63 = make-icu { version = "63.1"; hash = "sha256-BcSQtpRU/OWGC36OKCEjFnSvChHX7y/r6poyUSmYy50="; - nativeBuildRoot = buildPackages.icu63.override { buildRootOnly = true; }; patches = [ # https://bugzilla.mozilla.org/show_bug.cgi?id=1499398 (fetchpatch { @@ -72,12 +61,10 @@ in icu60 = make-icu { version = "60.2"; hash = "sha256-8HPqjzW5JtcLsz5ld1CKpkKosxaoA/Eb4grzhIEdtBg="; - nativeBuildRoot = buildPackages.icu60.override { buildRootOnly = true; }; }; icu58 = make-icu { version = "58.2"; hash = "sha256-KwpEEBU6myDeDiDH2LZgSacq7yRLU2g9DXUhNxaD2gw="; - nativeBuildRoot = buildPackages.icu58.override { buildRootOnly = true; }; patches = [ (fetchurl { url = "http://bugs.icu-project.org/trac/changeset/39484?format=diff"; @@ -87,4 +74,4 @@ in ]; patchFlags = [ "-p4" ]; }; - } +} diff --git a/pkgs/development/libraries/icu/make-icu.nix b/pkgs/development/libraries/icu/make-icu.nix index 5bae46714f2a..836a7e3c73a6 100644 --- a/pkgs/development/libraries/icu/make-icu.nix +++ b/pkgs/development/libraries/icu/make-icu.nix @@ -1,11 +1,11 @@ -{ stdenv, lib, fetchurl, fixDarwinDylibNames, testers }: +{ stdenv, lib, buildPackages, fetchurl, fixDarwinDylibNames, testers }: -{ version, hash, patches ? [], patchFlags ? [] -# Cross-compiled icu4c requires a build-root of a native compile -, buildRootOnly ? false, nativeBuildRoot -}: +{ version, hash, patches ? [], patchFlags ? [] }: let + # Cross-compiled icu4c requires a build-root of a native compile + nativeBuildRoot = buildPackages."icu${lib.versions.major version}".buildRootOnly; + pname = "icu4c"; baseAttrs = { @@ -99,10 +99,9 @@ let ''; }; - attrs = if buildRootOnly - then buildRootOnlyAttrs - else realAttrs; + mkWithAttrs = attrs: stdenv.mkDerivation (finalAttrs: attrs // { + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + passthru.buildRootOnly = mkWithAttrs buildRootOnlyAttrs; + }); in -stdenv.mkDerivation (finalAttrs: attrs // { - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; -}) + mkWithAttrs realAttrs From c6da730ebbe59fbd95d725b09c73213220bbc604 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 25 Feb 2024 01:29:19 +0000 Subject: [PATCH 091/160] cachix: 1.7 -> 1.7.1 --- .../haskell-modules/configuration-common.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 482abb918e02..711bb3ac2d23 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -393,22 +393,22 @@ self: super: { # Manually maintained cachix-api = overrideCabal (drv: { - version = "1.7"; + version = "1.7.1"; src = pkgs.fetchFromGitHub { owner = "cachix"; repo = "cachix"; - rev = "v1.7"; - sha256 = "sha256-d9BohugsKajvjNgt+VyXHuDdLOFKr9mhwpdUNkpIP3s="; + rev = "v1.7.1"; + sha256 = "sha256-neN8zGZuGXnLVdQw468z67o96mn8o1p4WGqPINl+NjU="; }; postUnpack = "sourceRoot=$sourceRoot/cachix-api"; }) super.cachix-api; cachix = (overrideCabal (drv: { - version = "1.7"; + version = "1.7.1"; src = pkgs.fetchFromGitHub { owner = "cachix"; repo = "cachix"; - rev = "v1.7"; - sha256 = "sha256-d9BohugsKajvjNgt+VyXHuDdLOFKr9mhwpdUNkpIP3s="; + rev = "v1.7.1"; + sha256 = "sha256-neN8zGZuGXnLVdQw468z67o96mn8o1p4WGqPINl+NjU="; }; postUnpack = "sourceRoot=$sourceRoot/cachix"; }) (lib.pipe From cfff6d56c8f3e8a05788ddfb527f3e3dd0cc8df6 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sat, 24 Feb 2024 17:30:19 -0800 Subject: [PATCH 092/160] maintainers/teams: remove r-burns from geospatial --- maintainers/team-list.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index c83b936cd81e..d43d6e975a81 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -342,7 +342,6 @@ with lib.maintainers; { imincik nh2 nialov - r-burns sikmir willcohen ]; From e9d69a1021123d77262217a1e50aa6a596badc47 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 Feb 2024 01:45:24 +0000 Subject: [PATCH 093/160] go-musicfox: 4.3.0 -> 4.3.1 --- pkgs/applications/audio/go-musicfox/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/go-musicfox/default.nix b/pkgs/applications/audio/go-musicfox/default.nix index 549ab0f692e7..3d67cb7d46e9 100644 --- a/pkgs/applications/audio/go-musicfox/default.nix +++ b/pkgs/applications/audio/go-musicfox/default.nix @@ -9,18 +9,18 @@ buildGoModule rec { pname = "go-musicfox"; - version = "4.3.0"; + version = "4.3.1"; src = fetchFromGitHub { owner = "go-musicfox"; repo = pname; rev = "v${version}"; - hash = "sha256-JDR3D3tILT0q9jqcZmbfQC3yn7cmaSL/GEpCguqCFXI="; + hash = "sha256-QZHuQAOnthSm7Kb82i3NUWTnKk+9OMHV5vzOU72inX0="; }; deleteVendor = true; - vendorHash = "sha256-ILO4v4ii1l9JokXG7R3vuN7i5hDi/hLHTFiClA2vdf0="; + vendorHash = "sha256-6DeoxpjVfykBI3fJAJpMZwJ4VTooIbxGpk5+SW198hU="; subPackages = [ "cmd/musicfox.go" ]; From 9bcd5e80a12054504deb4cc6da1887781fd37b70 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Sun, 25 Feb 2024 02:51:11 +0100 Subject: [PATCH 094/160] esphome: add missing dependency for font component --- pkgs/tools/misc/esphome/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 75004801ddab..02c18ac3a092 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -59,8 +59,9 @@ python.pkgs.buildPythonApplication rec { colorama cryptography esphome-dashboard - kconfiglib icmplib + kconfiglib + packaging paho-mqtt pillow platformio From 0e793bee16b8133dc96eb1234fa1d920e3fc3199 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 Feb 2024 02:06:26 +0000 Subject: [PATCH 095/160] python311Packages.pydrawise: 2024.1.1 -> 2024.2.0 --- pkgs/development/python-modules/pydrawise/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydrawise/default.nix b/pkgs/development/python-modules/pydrawise/default.nix index adddc92dbc1a..4ff553d1c392 100644 --- a/pkgs/development/python-modules/pydrawise/default.nix +++ b/pkgs/development/python-modules/pydrawise/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pydrawise"; - version = "2024.1.1"; + version = "2024.2.0"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "dknowles2"; repo = "pydrawise"; rev = "refs/tags/${version}"; - hash = "sha256-fMwWGE6WfgENti4H+WSfd8ZSHqxHyBVATUhng/o8qeY="; + hash = "sha256-eFjfO2lpRPgyTtzIutHqGIKC0SLKPBA4Pq0vhl9iCvs="; }; nativeBuildInputs = [ From 38f48906871fab6a379ce43d3adc054db5a48fa0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 Feb 2024 02:21:07 +0000 Subject: [PATCH 096/160] ravedude: 0.1.6 -> 0.1.7 --- pkgs/development/tools/rust/ravedude/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/ravedude/default.nix b/pkgs/development/tools/rust/ravedude/default.nix index aeb44664cf6c..ac5325336430 100644 --- a/pkgs/development/tools/rust/ravedude/default.nix +++ b/pkgs/development/tools/rust/ravedude/default.nix @@ -10,14 +10,14 @@ rustPlatform.buildRustPackage rec { pname = "ravedude"; - version = "0.1.6"; + version = "0.1.7"; src = fetchCrate { inherit pname version; - hash = "sha256-LhPRz3DUMDoe50Hq3yO+2BHpyh5fQ4sMNGLttjkdSZw="; + hash = "sha256-p5pbxnoUBhdDf7acpLStgBvoWZyFYNHxTwzDhGSApRM="; }; - cargoHash = "sha256-Uo8wlTAHBkn/WeGPhPP+BU80wjSyNHsWQj8QvA7mHrk="; + cargoHash = "sha256-L7eXSji+irjwuOZ5uxqWK9SesRZrqEeoenJgMzqpszo="; nativeBuildInputs = [ pkg-config ]; From e453c1c16a7b98a3951d0e05e285c1502ac3dd0b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 Feb 2024 03:04:51 +0000 Subject: [PATCH 097/160] csview: 1.2.2 -> 1.2.3 --- pkgs/tools/text/csview/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/csview/default.nix b/pkgs/tools/text/csview/default.nix index 0b69465ccfb9..2c450207f50c 100644 --- a/pkgs/tools/text/csview/default.nix +++ b/pkgs/tools/text/csview/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "csview"; - version = "1.2.2"; + version = "1.2.3"; src = fetchFromGitHub { owner = "wfxr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pv0zCtVHTjzkXK5EZhu6jviMJF0p9dvAuYcA6khiIos="; + sha256 = "sha256-O6IJGfJwGdtxLyUTFNHp9rGy05gVLlQTS8bTRsSYIuY="; }; - cargoSha256 = "sha256-uMBwEbxI8hjoFMlH+oquHvKdyLUC9bnO5uMFHkyZjgY="; + cargoHash = "sha256-jwkoyvelxl2lJoOHznZDmd39GJMye/+vi7PjrzjlLk4="; meta = with lib; { description = "A high performance csv viewer with cjk/emoji support"; From c13699ad67cdcb0a5cf1a3cc6963a5806253f052 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 25 Feb 2024 04:06:45 +0100 Subject: [PATCH 098/160] paperless-ngx: 2.5.2 -> 2.5.3 --- pkgs/applications/office/paperless-ngx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index 319234289515..bd99d093b097 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -22,13 +22,13 @@ }: let - version = "2.5.2"; + version = "2.5.3"; src = fetchFromGitHub { owner = "paperless-ngx"; repo = "paperless-ngx"; rev = "refs/tags/v${version}"; - hash = "sha256-v6k9clKNBNb2MQp0BTrUL9zfY6SUKfzaaOycmV8RKyk="; + hash = "sha256-fZ5grVZjCVkCH6doeqBLHPh9mPvHkiz+QXi/OyoJhR4="; }; python = python3; @@ -280,7 +280,7 @@ python.pkgs.buildPythonApplication rec { # Disable unneeded code coverage test substituteInPlace src/setup.cfg \ - --replace "--cov --cov-report=html --cov-report=xml" "" + --replace-fail "--cov --cov-report=html --cov-report=xml" "" ''; disabledTests = [ From c7e95762f69fddd95f66d36dea468405df7c2adb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 Feb 2024 03:07:44 +0000 Subject: [PATCH 099/160] libremines: 1.10.0 -> 2.0.0 --- pkgs/games/libremines/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/libremines/default.nix b/pkgs/games/libremines/default.nix index fb7f6ae96873..fddc2ba92001 100644 --- a/pkgs/games/libremines/default.nix +++ b/pkgs/games/libremines/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "libremines"; - version = "1.10.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "Bollos00"; repo = pname; rev = "v${version}"; - hash = "sha256-aqWzTvvRoke+Rakb6dNpDoD7haKHEKW3XARGLrH2WiY="; + hash = "sha256-LejDXjli+AEVGp23y+ez/NyJY/8w7uHcOij6RsDwIH4="; }; nativeBuildInputs = [ cmake wrapQtAppsHook ]; From 11cc6bd7988224e1c41e4af7547e5f788cd963f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 25 Feb 2024 04:08:08 +0100 Subject: [PATCH 100/160] paperless-ngx: cleanup dependencies --- .../office/paperless-ngx/default.nix | 78 +------------------ 1 file changed, 4 insertions(+), 74 deletions(-) diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index bd99d093b097..704689e20282 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -99,30 +99,12 @@ python.pkgs.buildPythonApplication rec { ]; propagatedBuildInputs = with python.pkgs; [ - amqp - anyio - asgiref - async-timeout - attrs - autobahn - automat - billiard bleach - celery - certifi - cffi - channels-redis channels - charset-normalizer - click - click-didyoumean - click-plugins - click-repl - coloredlogs + channels-redis concurrent-log-handler - constantly - cryptography dateparser + django django-allauth django-auditlog django-celery-results @@ -132,92 +114,41 @@ python.pkgs.buildPythonApplication rec { django-filter django-guardian django-multiselectfield - django - djangorestframework-guardian2 djangorestframework + djangorestframework-guardian2 drf-writable-nested filelock flower gotenberg-client gunicorn - h11 - h2 - hiredis - httptools - httpx - humanfriendly - humanize - hyperlink - idna imap-tools - img2pdf - incremental - inotify-simple inotifyrecursive - joblib langdetect - lxml - msgpack mysqlclient nltk ocrmypdf - packaging pathvalidate pdf2image - pikepdf - pillow - pluggy - portalocker - prompt-toolkit psycopg2 - pyasn1-modules - pyasn1 - pycparser - pyopenssl python-dateutil python-dotenv + python-gnupg python-ipware python-magic - python-gnupg - pytz - pyyaml pyzbar rapidfuzz redis - regex - reportlab - requests scikit-learn - scipy setproctitle - service-identity - sniffio - sqlparse - threadpoolctl tika-client - tornado tqdm - twisted - txaio - tzdata - tzlocal - urllib3 uvicorn - uvloop - vine watchdog - watchfiles - wcwidth - webencodings - websockets whitenoise whoosh - zipp - zope-interface zxing-cpp ] ++ redis.optional-dependencies.hiredis - ++ twisted.optional-dependencies.tls ++ uvicorn.optional-dependencies.standard; postBuild = '' @@ -262,7 +193,6 @@ python.pkgs.buildPythonApplication rec { pytest-rerunfailures pytest-xdist pytestCheckHook - reportlab ]; pytestFlagsArray = [ From 2fd5b9fd837a6ad52380b13a381dc4c5e6f64aa1 Mon Sep 17 00:00:00 2001 From: Maxwell L-T Date: Wed, 27 Dec 2023 23:07:10 -0500 Subject: [PATCH 101/160] outfox: init at 0.5.0-pre042 --- pkgs/by-name/ou/outfox/package.nix | 79 ++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 pkgs/by-name/ou/outfox/package.nix diff --git a/pkgs/by-name/ou/outfox/package.nix b/pkgs/by-name/ou/outfox/package.nix new file mode 100644 index 000000000000..b18ed662faff --- /dev/null +++ b/pkgs/by-name/ou/outfox/package.nix @@ -0,0 +1,79 @@ +{ lib +, stdenv +, fetchurl +, autoPatchelfHook +, alsa-lib +, freetype +, libjack2 +, libglvnd +, libpulseaudio +, makeDesktopItem +, makeWrapper +}: + +stdenv.mkDerivation rec { + pname = "outfox"; + version = "0.5.0-pre042"; + + src = { + i686-linux = fetchurl { + url = "https://github.com/TeamRizu/OutFox/releases/download/OF5.0.0-042/OutFox-alpha-0.5.0-pre042-Linux-14.04-32bit-i386-i386-legacy-date-20231227.tar.gz"; + sha256 = "sha256-NFjNoqJ7Fq4A7Y0k6oQcWjykV+/b/MiRtJ1p6qlZdjs="; + }; + x86_64-linux = fetchurl { + url = "https://github.com/TeamRizu/OutFox/releases/download/OF5.0.0-042/OutFox-alpha-0.5.0-pre042-Linux-22.04-amd64-current-date-20231224.tar.gz"; + hash = "sha256-dW+g/JYav3rUuI+nHDi6rXu/O5KYiEdk/HH82jgOUnI="; + }; + aarch64-linux = fetchurl { + url = "https://github.com/TeamRizu/OutFox/releases/download/OF5.0.0-042/OutFox-alpha-0.5.0-pre042-Raspberry-Pi-Linux-18.04-arm64-arm64v8-modern-date-20231225.tar.gz"; + hash = "sha256-7Qrq6t8KmUSIK4Rskkxw5l4UZ2vsb9/orzPegHySaJ4="; + }; + armv7l-linux = fetchurl { + url = "https://github.com/TeamRizu/OutFox/releases/download/OF5.0.0-042/OutFox-alpha-0.5.0-pre042-Raspberry-Pi-Linux-14.04-arm32-arm32v7-legacy-date-20231227.tar.gz"; + hash = "sha256-PRp7kuqFBRy7nextTCB+/poc+A9AX2EiQphx6aUfT8E="; + }; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + + nativeBuildInputs = [ + autoPatchelfHook + makeWrapper + ]; + + buildInputs = [ + alsa-lib + freetype + libjack2 + libglvnd + libpulseaudio + ]; + + desktop = makeDesktopItem { + name = "project-outfox"; + desktopName = "Project OutFox"; + genericName = "Rhythm game engine"; + exec = "OutFox"; + tryExec = "OutFox"; + categories = [ "Game" ]; + }; + + patchPhase = '' + find ./Appearance -type f -executable -exec chmod -x {} \; + ''; + + installPhase = '' + mkdir -p $out/bin $out/share/OutFox $out/share/applications + cp -r ./. $out/share/OutFox + ln -s ${desktop}/share/applications/project-outfox.desktop $out/share/applications/project-outfox.desktop + makeWrapper $out/share/OutFox/OutFox $out/bin/OutFox --argv0 + ''; + + meta = with lib; { + description = "A rhythm game engine forked from StepMania"; + homepage = "https://projectoutfox.com"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.unfree; + platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "armv7l-linux" ]; + maintainers = with maintainers; [ maxwell-lt ]; + mainProgram = "OutFox"; + }; +} From f2cd1230bf796fdd298918a9076a3100fb6d954e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 24 Feb 2024 07:42:01 -0800 Subject: [PATCH 102/160] python311Packages.systembridgemodels: init at 4.0.0 --- .../systembridgemodels/default.nix | 51 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/development/python-modules/systembridgemodels/default.nix diff --git a/pkgs/development/python-modules/systembridgemodels/default.nix b/pkgs/development/python-modules/systembridgemodels/default.nix new file mode 100644 index 000000000000..16a16b3a8da4 --- /dev/null +++ b/pkgs/development/python-modules/systembridgemodels/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, fetchpatch2 +, setuptools +, incremental +}: + +buildPythonPackage rec { + pname = "systembridgemodels"; + version = "4.0.0"; + pyproject = true; + + disabled = pythonOlder "3.11"; + + src = fetchFromGitHub { + owner = "timmo001"; + repo = "system-bridge-models"; + rev = "refs/tags/${version}"; + hash = "sha256-4nbTsVRqtoX4UhTrQS4HwoLtx0RO1VA8UewSAWOSsik="; + }; + + patches = [ + (fetchpatch2 { + url = "https://github.com/timmo001/system-bridge-models/commit/7cd506760fd47c0f3717b6fcfe127b673e3198f8.patch"; + hash = "sha256-i+GCcoyX07ii9Kj46dtAlT85jUKfF0KHEH9++UTjiik="; + }) + ]; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + incremental + ]; + + pythonImportsCheck = [ "systembridgemodels" ]; + + # upstream has no tests + doCheck = false; + + meta = { + changelog = "https://github.com/timmo001/system-bridge-models/releases/tag/${version}"; + description = "This is the models package used by the System Bridge project"; + homepage = "https://github.com/timmo001/system-bridge-models"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 16e7f5195025..e62b842678be 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14198,6 +14198,8 @@ self: super: with self; { systembridge = callPackage ../development/python-modules/systembridge { }; + systembridgemodels = callPackage ../development/python-modules/systembridgemodels { }; + systemd = callPackage ../development/python-modules/systemd { inherit (pkgs) systemd; }; From a05bba99fdd4a63bc02160bc1187e11133f7fbd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 24 Feb 2024 21:15:31 -0800 Subject: [PATCH 103/160] python311Packages.systembridgeconnector: init at 4.0.1 --- .../systembridgeconnector/default.nix | 47 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/development/python-modules/systembridgeconnector/default.nix diff --git a/pkgs/development/python-modules/systembridgeconnector/default.nix b/pkgs/development/python-modules/systembridgeconnector/default.nix new file mode 100644 index 000000000000..c1b734bcbda9 --- /dev/null +++ b/pkgs/development/python-modules/systembridgeconnector/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, setuptools +, aiohttp +, incremental +, systembridgemodels +}: + +buildPythonPackage rec { + pname = "systembridgeconnector"; + version = "4.0.1"; + pyproject = true; + + disabled = pythonOlder "3.11"; + + src = fetchFromGitHub { + owner = "timmo001"; + repo = "system-bridge-connector"; + rev = "refs/tags/${version}"; + hash = "sha256-dMOhw7e2sCmGItsgGcGxYVCIJM2FBm6IyxIQXPtY+Pg="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + aiohttp + incremental + systembridgemodels + ]; + + pythonImportsCheck = [ "systembridgeconnector" ]; + + # upstream has no tests + doCheck = false; + + meta = { + changelog = "https://github.com/timmo001/system-bridge-connector/releases/tag/${version}"; + description = "This is the connector package for the System Bridge project"; + homepage = "https://github.com/timmo001/system-bridge-connector"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e62b842678be..a746b32aa23a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14198,6 +14198,8 @@ self: super: with self; { systembridge = callPackage ../development/python-modules/systembridge { }; + systembridgeconnector = callPackage ../development/python-modules/systembridgeconnector { }; + systembridgemodels = callPackage ../development/python-modules/systembridgemodels { }; systemd = callPackage ../development/python-modules/systemd { From c1678610c7890d771d13fcd8cf94e6f8d49ba978 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 24 Feb 2024 21:20:57 -0800 Subject: [PATCH 104/160] home-assistant: support system_bridge component --- pkgs/servers/home-assistant/component-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 69820ea320de..5e4754d36d18 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -4887,8 +4887,9 @@ ifaddr psutil-home-assistant sqlalchemy + systembridgeconnector zeroconf - ]; # missing inputs: systembridgeconnector + ]; "system_health" = ps: with ps; [ aiohttp-cors aiohttp-fast-url-dispatcher @@ -6490,6 +6491,7 @@ "syncthing" "syncthru" "synology_dsm" + "system_bridge" "system_health" "system_log" "systemmonitor" From 9eef6418f630172b94f50285779c034bc52f90bd Mon Sep 17 00:00:00 2001 From: Rhys Davies Date: Sat, 24 Feb 2024 18:20:54 +1300 Subject: [PATCH 105/160] fend: 1.4.0 -> 1.4.3 --- pkgs/tools/misc/fend/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/fend/default.nix b/pkgs/tools/misc/fend/default.nix index a3e46fa4f18d..7e65fe68dfd5 100644 --- a/pkgs/tools/misc/fend/default.nix +++ b/pkgs/tools/misc/fend/default.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage rec { pname = "fend"; - version = "1.4.0"; + version = "1.4.3"; src = fetchFromGitHub { owner = "printfn"; - repo = pname; + repo = "fend"; rev = "v${version}"; - sha256 = "sha256-s6b15FhVfEwsHtVt4bhd6LDxl/WW1PXlUrH2XFOTT5E="; + hash = "sha256-X96r5wN5eq1PZD/JGqnG/0kg6PYEdnj5h9zc+GXQjQM="; }; - cargoHash = "sha256-Ilsv0mo7/4eEdRH3jWZXdF4LSYYdWr6gCvnMMAZn5j0="; + cargoHash = "sha256-UIZs45OQ1j57VEb6g4P0AwjmEsjMt0am5FUXXDODaWI="; nativeBuildInputs = [ pandoc installShellFiles copyDesktopItems ]; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; @@ -46,7 +46,7 @@ rustPlatform.buildRustPackage rec { ''; postInstall = '' - install -D -m 444 $src/icon/fend-icon-256.png $out/share/icons/hicolor/256x256/apps/fend.png + install -D -m 444 $src/icon/icon.svg $out/share/icons/hicolor/scalable/apps/fend.svg ''; desktopItems = [ From dffd93aefec868817058586392c43b2c0affee42 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 Feb 2024 06:23:33 +0000 Subject: [PATCH 106/160] git-ignore: 1.3.1 -> 1.3.3 --- pkgs/applications/version-management/git-ignore/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-ignore/default.nix b/pkgs/applications/version-management/git-ignore/default.nix index d15c646a2d01..b32b1aa52161 100644 --- a/pkgs/applications/version-management/git-ignore/default.nix +++ b/pkgs/applications/version-management/git-ignore/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "git-ignore"; - version = "1.3.1"; + version = "1.3.3"; src = fetchFromGitHub { owner = "sondr3"; repo = pname; rev = "v${version}"; - hash = "sha256-kfc4LIFjLMltCn3BPaEfxc/yOZxFjYioyobTQZN/RmY="; + hash = "sha256-OVKRNj3tRi/PGY1m4rdpmH87laYzTkCiwoBc3txVJ3U="; }; - cargoHash = "sha256-HoW10XzWIjxsqoKVKQkMf5in7pOODGnUM0cRZP1OJpg="; + cargoHash = "sha256-dAQKL+sMThpTqBoN5MZvm8tQUJhaSH7lT8DwbjzFq40="; nativeBuildInputs = [ installShellFiles From 0c544b0f0fa8c58fbc3bec059a9b8606f974d52a Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 25 Feb 2024 07:49:10 +0000 Subject: [PATCH 107/160] sortmerna: fix `gcc-13` build Without the change the build on `master` fails as https://hydra.nixos.org/build/249070958: In file included from /build/source/src/sortmerna/kseq_load.cpp:38: /build/source/include/kseq_load.hpp:61:12: error: 'uint64_t' has not been declared 61 | uint64_t number_total_read, | ^~~~~~~~ --- pkgs/applications/science/biology/sortmerna/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/science/biology/sortmerna/default.nix b/pkgs/applications/science/biology/sortmerna/default.nix index a529867aaa74..bfd6d20f1384 100644 --- a/pkgs/applications/science/biology/sortmerna/default.nix +++ b/pkgs/applications/science/biology/sortmerna/default.nix @@ -32,6 +32,10 @@ stdenv.mkDerivation rec { substituteInPlace src/sortmerna/CMakeLists.txt \ --replace "target_link_libraries(sortmerna" \ "target_link_libraries(sortmerna Threads::Threads" + + # Fix gcc-13 build by adding missing includes: + # https://github.com/sortmerna/sortmerna/issues/412 + sed -e '1i #include ' -i include/kseq_load.hpp ''; meta = with lib; { From 14c876fe5775b5ef89d6b5664ea7e6e46b6b81ca Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 Feb 2024 07:51:45 +0000 Subject: [PATCH 108/160] renode-dts2repl: unstable-2024-02-19 -> unstable-2024-02-23 --- 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 370a9523217e..c39103910f62 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 = "unstable-2024-02-19"; + version = "unstable-2024-02-23"; pyproject = true; src = fetchFromGitHub { owner = "antmicro"; repo = "dts2repl"; - rev = "d0bf509a04327bfe5a8542fdbcc71cf368bb9ac7"; - hash = "sha256-era8iyKOk5JzemSWk20ojjtoRsjSA43uzQC1ZFXUkZc="; + rev = "ae616f4f6a70a2f497c2a9ce8c9c64b34238e553"; + hash = "sha256-2Q7hfXf9nCrmHxJ0S8njF5zIgcGXaRPPVogtsPgLLsI="; }; nativeBuildInputs = [ From def674b7cc0599d5dc0e27e2e9e25659ca19f18b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 Feb 2024 08:07:00 +0000 Subject: [PATCH 109/160] wdt: unstable-2023-12-01 -> unstable-2024-02-05 --- pkgs/applications/networking/sync/wdt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/sync/wdt/default.nix b/pkgs/applications/networking/sync/wdt/default.nix index f6eb3a326cbd..521453e5ecb8 100644 --- a/pkgs/applications/networking/sync/wdt/default.nix +++ b/pkgs/applications/networking/sync/wdt/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation { pname = "wdt"; - version = "unstable-2023-12-01"; + version = "unstable-2024-02-05"; src = fetchFromGitHub { owner = "facebook"; repo = "wdt"; - rev = "66f17af009ef6eaf2707bb8bb511ba6bcf3d9bbe"; - sha256 = "sha256-ucnFcpH9Duru35kRT769zMX2BMqufZJopd2srKPJkrU="; + rev = "d94b2d5df6f1c803f9f3b8ed9247b752fa853865"; + sha256 = "sha256-9TeJbZZq9uQ6KaEBFGDyIGcXgxi2y1aj55vxv5dAIzw="; }; nativeBuildInputs = [ cmake ]; From 8c5aa406973bf43c080f20cabff430757a6d54d2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 Feb 2024 08:08:29 +0000 Subject: [PATCH 110/160] whisper-ctranslate2: 0.3.9 -> 0.4.1 --- pkgs/tools/audio/whisper-ctranslate2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/whisper-ctranslate2/default.nix b/pkgs/tools/audio/whisper-ctranslate2/default.nix index a380eda1fe6a..7fd2959a9a79 100644 --- a/pkgs/tools/audio/whisper-ctranslate2/default.nix +++ b/pkgs/tools/audio/whisper-ctranslate2/default.nix @@ -5,7 +5,7 @@ }: let pname = "whisper-ctranslate2"; - version = "0.3.9"; + version = "0.4.1"; in python3.pkgs.buildPythonApplication { inherit pname version; @@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication { owner = "Softcatala"; repo = "whisper-ctranslate2"; rev = version; - hash = "sha256-dm8LPcAVxEvhFDEkZcFXFZLfEZTtKzTqBqWKfXbXn5Q="; + hash = "sha256-kFln/AqKjnEK5L9hOqGpyoRjNG+dagBIGrmq2C+OZOY="; }; propagatedBuildInputs = with python3.pkgs; [ From aa201331a933f042b58086758654394074a4d7dc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Feb 2024 10:33:01 +0100 Subject: [PATCH 111/160] python312Packages.odp-amsterdam: 6.0.0 -> 6.0.1 Diff: https://github.com/klaasnicolaas/python-odp-amsterdam/compare/refs/tags/v6.0.0...v6.0.1 Changelog: https://github.com/klaasnicolaas/python-odp-amsterdam/releases/tag/v6.0.1 --- pkgs/development/python-modules/odp-amsterdam/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/odp-amsterdam/default.nix b/pkgs/development/python-modules/odp-amsterdam/default.nix index 9f8f810b4be9..e847982f9b65 100644 --- a/pkgs/development/python-modules/odp-amsterdam/default.nix +++ b/pkgs/development/python-modules/odp-amsterdam/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "odp-amsterdam"; - version = "6.0.0"; + version = "6.0.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "klaasnicolaas"; repo = "python-odp-amsterdam"; rev = "refs/tags/v${version}"; - hash = "sha256-dAyKypc8bMWkXhYa7BlGGAGqPaPJHFHwXd/UK80BGoE="; + hash = "sha256-teLjiclkbjlG226gMUgqc2IUEWqKcSm6xIekw+AQPU4="; }; postPatch = '' From 6146da7223b51fdcdbddbc46726aafedab93538c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 Feb 2024 09:37:12 +0000 Subject: [PATCH 112/160] tagref: 1.9.0 -> 1.9.1 --- pkgs/tools/misc/tagref/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/tagref/default.nix b/pkgs/tools/misc/tagref/default.nix index 84eeef609eec..0b8ebf82730d 100644 --- a/pkgs/tools/misc/tagref/default.nix +++ b/pkgs/tools/misc/tagref/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "tagref"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "stepchowfun"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SPmpQR4RMimU6RnljmqV9z0WvDRZkc+Y+C32BnNmK/E="; + sha256 = "sha256-4F9u1wzeBgYP3L6h08xMvgq62ix/SOaFaLl7uEf1j1c="; }; - cargoHash = "sha256-VufTLK1LDQlIiNNsV9q24sHTmcT1Y7bCnhIXPRvuRAU="; + cargoHash = "sha256-AO6BGevCoLCH4vpyrXrgF3FrjUa3lHA7ynXfk4KKigM="; meta = with lib; { description = "Manage cross-references in your code"; From b49dcb94d6e03db23de1a1a320aba1d875a44a8c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Feb 2024 10:54:05 +0100 Subject: [PATCH 113/160] python312Packages.aioautomower: 2024.2.7 -> 2024.2.8 Diff: https://github.com/Thomas55555/aioautomower/compare/refs/tags/2024.2.7...2024.2.8 Changelog: https://github.com/Thomas55555/aioautomower/releases/tag/2024.2.8 --- pkgs/development/python-modules/aioautomower/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioautomower/default.nix b/pkgs/development/python-modules/aioautomower/default.nix index 02e0dcc3d90f..834fc55188c2 100644 --- a/pkgs/development/python-modules/aioautomower/default.nix +++ b/pkgs/development/python-modules/aioautomower/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aioautomower"; - version = "2024.2.7"; + version = "2024.2.8"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Thomas55555"; repo = "aioautomower"; rev = "refs/tags/${version}"; - hash = "sha256-ij/Webe/YqpAyjCXFpKq0eyvTegiTDJYiMASuUJKc7Q="; + hash = "sha256-YdC6459lEvHDnX4L26n28oGzDSsa7/8UGHjnONhn9Yo="; }; postPatch = '' From ed75c1ad48689f52610bfe9f569245c8c03652b7 Mon Sep 17 00:00:00 2001 From: Raroh73 <96078496+Raroh73@users.noreply.github.com> Date: Fri, 16 Feb 2024 15:05:57 +0100 Subject: [PATCH 114/160] vscode-extensions.continue.continue: init at 0.8.12 --- .../editors/vscode/extensions/default.nix | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 1c6d03d8ddfe..a002bc3ac197 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -903,6 +903,54 @@ let contextmapper.context-mapper-vscode-extension = callPackage ./contextmapper.context-mapper-vscode-extension { }; + continue.continue = buildVscodeMarketplaceExtension { + mktplcRef = + let + sources = { + "x86_64-linux" = { + arch = "linux-x64"; + sha256 = "05kh6sf3jv3510q33chf8s5n1kfp9wcm7650va7mcrdkfr9g8ysq"; + }; + "x86_64-darwin" = { + arch = "darwin-x64"; + sha256 = "0242h9kq47qvs1xynr5x8dzxkc5pwgb6km0iqpyy9kydg8ng1vp3"; + }; + "aarch64-linux" = { + arch = "linux-arm64"; + sha256 = "1qm3f2lh8mi3hnyp2bmx7j2lir6fmbbxkzh6b8zf579khhbapnaz"; + }; + "aarch64-darwin" = { + arch = "darwin-arm64"; + sha256 = "18w22z1c5qgkpw2zlwmi9gs9dx1pcm51f0r8my7ynnvgl6mp12sg"; + }; + }; + in + { + name = "continue"; + publisher = "Continue"; + version = "0.8.12"; + } // sources.${stdenv.system}; + nativeBuildInputs = [ + autoPatchelfHook + ]; + buildInputs = [ + stdenv.cc.cc.lib + ]; + postInstall = '' + cd "$out/$installPrefix" + substituteInPlace "out/extension.js" \ + --replace-fail 'await showTutorial();' '//await showTutorial();' + ''; + meta = { + description = "Open-source autopilot for software development - bring the power of ChatGPT to your IDE"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=Continue.continue"; + homepage = "https://github.com/continuedev/continue"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.raroh73 ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" "aarch64-linux" ]; + }; + }; + coolbear.systemd-unit-file = buildVscodeMarketplaceExtension { mktplcRef = { publisher = "coolbear"; From e575b2a430a90119ea701c8942a84cad803005d3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Feb 2024 11:01:26 +0100 Subject: [PATCH 115/160] python312Packages.pynuki: refactor --- pkgs/development/python-modules/pynuki/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pynuki/default.nix b/pkgs/development/python-modules/pynuki/default.nix index 9a6d57b96d77..28c7117d680a 100644 --- a/pkgs/development/python-modules/pynuki/default.nix +++ b/pkgs/development/python-modules/pynuki/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "pynuki"; version = "1.6.3"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "pschmitt"; - repo = pname; + repo = "pynuki"; rev = "refs/tags/${version}"; hash = "sha256-PF5FmAuPcJXq8gQ8HyzdtL2HiiUjueT+LAS1lYRvrwM="; }; From a96d58f5f764f51b6b746f347275fbc43e1ec387 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Feb 2024 11:10:15 +0100 Subject: [PATCH 116/160] python312Packages.http-message-signatures: 0.4.4 -> 0.5.0 Diff: https://github.com/pyauth/http-message-signatures/compare/v0.4.4...v0.5.0 --- .../python-modules/http-message-signatures/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/http-message-signatures/default.nix b/pkgs/development/python-modules/http-message-signatures/default.nix index bc3351feb3d8..b9ccede6714e 100644 --- a/pkgs/development/python-modules/http-message-signatures/default.nix +++ b/pkgs/development/python-modules/http-message-signatures/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "http-message-signatures"; - version = "0.4.4"; + version = "0.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pyauth"; repo = pname; rev = "v${version}"; - hash = "sha256-acTziJM5H5Td+eG/LNrlNwgpVvFDyl/tf6//YuE1XZk="; + hash = "sha256-Jsivw4lNA/2oqsOGGx8D4gUPftzuys877A9RXyapnSQ="; }; nativeBuildInputs = [ From 2581942b61f6649aea47bd36e14968c32ef988c1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Feb 2024 11:12:34 +0100 Subject: [PATCH 117/160] python312Packages.pytedee-async: 0.2.13 -> 0.2.14 Diff: https://github.com/zweckj/pytedee_async/compare/refs/tags/v0.2.13...v0.2.14 Changelog: https://github.com/zweckj/pytedee_async/releases/tag/v0.2.14 --- pkgs/development/python-modules/pytedee-async/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytedee-async/default.nix b/pkgs/development/python-modules/pytedee-async/default.nix index f4ce2c7bcd89..e42af981cf33 100644 --- a/pkgs/development/python-modules/pytedee-async/default.nix +++ b/pkgs/development/python-modules/pytedee-async/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pytedee-async"; - version = "0.2.13"; + version = "0.2.14"; pyproject = true; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "zweckj"; repo = "pytedee_async"; rev = "refs/tags/v${version}"; - hash = "sha256-3W+eqkniDMoDKeute5w1QyklOc/aren/Q8txBEI/4ys="; + hash = "sha256-BtBHiDOYe8BkrqJEGG4eGKFMnCspCQK4fvcj2vvGmFM="; }; nativeBuildInputs = [ From 7a0bebd7c1ec3beb6edc741d83df06d142b4bbc6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Feb 2024 11:15:18 +0100 Subject: [PATCH 118/160] python311Packages.pyunifiprotect: 4.23.3 -> 4.23.4 Diff: https://github.com/briis/pyunifiprotect/compare/refs/tags/v4.23.3...v4.23.4 Changelog: https://github.com/AngellusMortis/pyunifiprotect/releases/tag/v4.23.4 --- pkgs/development/python-modules/pyunifiprotect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyunifiprotect/default.nix b/pkgs/development/python-modules/pyunifiprotect/default.nix index cc846a024d8e..79b940d5be1d 100644 --- a/pkgs/development/python-modules/pyunifiprotect/default.nix +++ b/pkgs/development/python-modules/pyunifiprotect/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "pyunifiprotect"; - version = "4.23.3"; + version = "4.23.4"; pyproject = true; disabled = pythonOlder "3.9"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "briis"; repo = "pyunifiprotect"; rev = "refs/tags/v${version}"; - hash = "sha256-QWIiBuKDhSNYVyEm45QV4a2UxADDrBdiCBeJI+a6v7c="; + hash = "sha256-sBdu4XJkEtHf6dlHgJKFQvONp1x89NiS2EgxMiJFX7A="; }; env.SETUPTOOLS_SCM_PRETEND_VERSION = version; From cfa72b3971c455d39db3e09b68d9da13b6d457be Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Feb 2024 11:17:42 +0100 Subject: [PATCH 119/160] trufflehog: 3.68.1 -> 3.68.2 Diff: https://github.com/trufflesecurity/trufflehog/compare/refs/tags/v3.68.1...v3.68.2 Changelog: https://github.com/trufflesecurity/trufflehog/releases/tag/v3.68.2 --- pkgs/tools/security/trufflehog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index fabf645f7e73..00c7ceeb70bd 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.68.1"; + version = "3.68.2"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-KHMQnAI0t532YGOh7jtuuLCfRrXkzPuWOBEWaJ45HCs="; + hash = "sha256-6gQoyVlLE+cXYwh8lTkL2giDhd3ETgETjT3XuEOwOU8="; }; vendorHash = "sha256-D58WqqDwQo7fRubkGNRhD6g9ooKS9peb2qJJDRXgLtk="; From 6e1a53a37145516ee0d630c6514d783d21a9a3a5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Feb 2024 11:18:36 +0100 Subject: [PATCH 120/160] metasploit: 6.3.56 -> 6.3.57 --- pkgs/tools/security/metasploit/Gemfile | 2 +- pkgs/tools/security/metasploit/Gemfile.lock | 10 +++++----- pkgs/tools/security/metasploit/default.nix | 4 ++-- pkgs/tools/security/metasploit/gemset.nix | 10 +++++----- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 60585ed8faad..3f528744390e 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.56" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.57" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 0bbafa821150..04cc6dd3fbfd 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: ff8298ede09a5e825d5d53775f36d60cd4110f17 - ref: refs/tags/6.3.56 + revision: e01334b3bd267539df650f14627231fb8e4bc21d + ref: refs/tags/6.3.57 specs: - metasploit-framework (6.3.56) + metasploit-framework (6.3.57) actionpack (~> 7.0.0) activerecord (~> 7.0.0) activesupport (~> 7.0.0) @@ -35,7 +35,7 @@ GIT metasploit-concern metasploit-credential metasploit-model - metasploit-payloads (= 2.0.165) + metasploit-payloads (= 2.0.166) metasploit_data_models metasploit_payloads-mettle (= 1.0.26) mqtt @@ -254,7 +254,7 @@ GEM activemodel (~> 7.0) activesupport (~> 7.0) railties (~> 7.0) - metasploit-payloads (2.0.165) + metasploit-payloads (2.0.166) metasploit_data_models (6.0.3) activerecord (~> 7.0) activesupport (~> 7.0) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 9f2268eafe07..ebfb36b8227c 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.3.56"; + version = "6.3.57"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = "refs/tags/${version}"; - hash = "sha256-BF/8+Quu8heS+VKn5ciHfZLTAmoliO25O4BccQBj4bE="; + hash = "sha256-MToWengiF4dacD6E0byZENNMh408d3YJ18sn93nEksI="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 5248a4c49add..b9285cdab6b1 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -664,12 +664,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "ff8298ede09a5e825d5d53775f36d60cd4110f17"; - sha256 = "1cg1cc072p407fwyv215d81d74kxhz4fb9sjz691gwmf1gwzqpq4"; + rev = "e01334b3bd267539df650f14627231fb8e4bc21d"; + sha256 = "1hljqiwzf9ybsw4pcxrwin3lrlqhk6yd311yf1d8f5r2g1x1cfii"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.3.56"; + version = "6.3.57"; }; metasploit-model = { groups = ["default"]; @@ -686,10 +686,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0v9vr3iklxm53vfkyiqja8a942n8r0a49w9rmvk9ql4h3r5xcgpw"; + sha256 = "0f8grdgqn9y8wc61k111zlap5vqjika56k4vabkwglljs5bv44nk"; type = "gem"; }; - version = "2.0.165"; + version = "2.0.166"; }; metasploit_data_models = { groups = ["default"]; From f7b6bf28638a078628f8ba80e81116e4e69692ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 25 Feb 2024 11:35:26 +0100 Subject: [PATCH 121/160] blender: patch build after cmake update https://hydra.nixos.org/build/250783520/nixlog/1/tail --- pkgs/applications/misc/blender/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 996e982bdc59..ec1f11617321 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, lib, fetchurl, fetchzip, boost, cmake, ffmpeg, gettext, glew +{ config, stdenv, lib, fetchurl, fetchzip, fetchpatch, boost, cmake, ffmpeg, gettext, glew , libepoxy, libXi, libX11, libXext, libXrender , libjpeg, libpng, libsamplerate, libsndfile , libtiff, libwebp, libGLU, libGL, openal, opencolorio, openexr, openimagedenoise, openimageio, openjpeg, python310Packages @@ -47,6 +47,10 @@ stdenv.mkDerivation (finalAttrs: rec { patches = [ ./draco.patch + (fetchpatch { + url = "https://projects.blender.org/blender/blender/commit/cf4365e555a759d5b3225bce77858374cb07faad.diff"; + hash = "sha256-Nypd04yFSHYa7RBa8kNmoApqJrU4qpaOle3tkj44d4g="; + }) ] ++ lib.optional stdenv.isDarwin ./darwin.patch; nativeBuildInputs = From 730f3c482e65c8b73bbe7a80685acb44e9047208 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 Feb 2024 10:38:16 +0000 Subject: [PATCH 122/160] discord-canary: 0.0.278 -> 0.0.282 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 721d976e8f4e..e95b9eb99905 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -4,7 +4,7 @@ let if stdenv.isLinux then { stable = "0.0.43"; ptb = "0.0.71"; - canary = "0.0.278"; + canary = "0.0.282"; development = "0.0.13"; } else { stable = "0.0.294"; @@ -25,7 +25,7 @@ let }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - hash = "sha256-ypnw/CDY02jD8xLpJvS4Y7GjahgvUhcmV7zSDaVkNpk="; + hash = "sha256-+Ijl/yPa7DVzVKOWTxCu6FxIsschIqYa+tYBnnKdCBA="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; From 764f14dc9279dfcaba74e4ea35353830ae0d69ec Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Feb 2024 12:17:50 +0100 Subject: [PATCH 123/160] aws-sam-cli: refactor --- .../development/tools/aws-sam-cli/default.nix | 47 ++++++++++--------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix index 45c3e4c62a7a..3b6c702912fb 100644 --- a/pkgs/development/tools/aws-sam-cli/default.nix +++ b/pkgs/development/tools/aws-sam-cli/default.nix @@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec { pname = "aws-sam-cli"; version = "1.108.0"; - format = "pyproject"; + pyproject = true; disabled = python3.pythonOlder "3.8"; @@ -28,16 +28,16 @@ python3.pkgs.buildPythonApplication rec { ]; pythonRelaxDeps = [ + "aws-lambda-builders" "aws-sam-translator" "boto3-stubs" "cfn-lint" - "tzlocal" "cookiecutter" "docker" - "aws-lambda-builders" - "tomlkit" - "rich" "jsonschema" + "rich" + "tomlkit" + "tzlocal" ]; propagatedBuildInputs = with python3.pkgs; [ @@ -86,8 +86,6 @@ python3.pkgs.buildPythonApplication rec { --prefix PATH : $out/bin:${lib.makeBinPath [ git ]} ''; - doCheck = true; - nativeCheckInputs = with python3.pkgs; [ filelock flaky @@ -105,22 +103,27 @@ python3.pkgs.buildPythonApplication rec { pytestFlagsArray = [ "tests" - - # Disable tests that requires networking or complex setup - "--ignore=tests/end_to_end" - "--ignore=tests/integration" - "--ignore=tests/regression" - "--ignore=tests/smoke" - "--ignore=tests/unit/lib/telemetry" - - # Disable flaky tests - "--ignore=tests/unit/lib/samconfig/test_samconfig.py" - "--deselect=tests/unit/lib/sync/flows/test_rest_api_sync_flow.py::TestRestApiSyncFlow::test_update_stage" - "--deselect=tests/unit/lib/sync/flows/test_rest_api_sync_flow.py::TestRestApiSyncFlow::test_delete_deployment" - "--deselect=tests/unit/local/lambda_service/test_local_lambda_invoke_service.py::TestValidateRequestHandling::test_request_with_no_data" - # Disable warnings - "-W ignore::DeprecationWarning" + "-W" + "ignore::DeprecationWarning" + ]; + + disabledTestPaths = [ + # Disable tests that requires networking or complex setup + "tests/end_to_end" + "tests/integration" + "tests/regression" + "tests/smoke" + "tests/unit/lib/telemetry" + # Disable flaky tests + "tests/unit/lib/samconfig/test_samconfig.py" + ]; + + disabledTests = [ + # Disable flaky tests + "test_update_stage" + "test_delete_deployment" + "test_request_with_no_data" ]; pythonImportsCheck = [ From 24eabec84c59efd1d893c2aa1ce9b9f22064dd8b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Feb 2024 12:20:13 +0100 Subject: [PATCH 124/160] aws-sam-cli: 1.108.0 -> 1.110.0 Changelog: https://github.com/aws/aws-sam-cli/releases/tag/v1.110.0 --- pkgs/development/tools/aws-sam-cli/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix index 3b6c702912fb..5ab92dbe8b18 100644 --- a/pkgs/development/tools/aws-sam-cli/default.nix +++ b/pkgs/development/tools/aws-sam-cli/default.nix @@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication rec { pname = "aws-sam-cli"; - version = "1.108.0"; + version = "1.110.0"; pyproject = true; disabled = python3.pythonOlder "3.8"; @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { owner = "aws"; repo = "aws-sam-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-k6SXCFkISyfr5/0vhe/Dfzs4qsVfu14lFx/bl53QxR4="; + hash = "sha256-FJHHEsdi2uGP9/GxrANsVEuxZiS4M4BPBGoARQBQpkA="; }; nativeBuildInputs = with python3.pkgs; [ @@ -35,7 +35,9 @@ python3.pkgs.buildPythonApplication rec { "cookiecutter" "docker" "jsonschema" + "pyopenssl" "rich" + "ruamel-yaml" "tomlkit" "tzlocal" ]; From b7e67c43e3d19fb1eda1e31e66f4f8787fac1164 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Feb 2024 12:42:15 +0100 Subject: [PATCH 125/160] python311Packages.zamg: 0.3.5 -> 0.3.6 Diff: https://github.com/killer0071234/python-zamg/compare/refs/tags/v0.3.5...v0.3.6 Changelog: https://github.com/killer0071234/python-zamg/releases/tag/v0.3.6 --- pkgs/development/python-modules/zamg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zamg/default.nix b/pkgs/development/python-modules/zamg/default.nix index d43b0c4c779d..770764dde09d 100644 --- a/pkgs/development/python-modules/zamg/default.nix +++ b/pkgs/development/python-modules/zamg/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "zamg"; - version = "0.3.5"; + version = "0.3.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "killer0071234"; repo = "python-zamg"; rev = "refs/tags/v${version}"; - hash = "sha256-lT345G0apo4ncM4FMs69+ql+QxvTlsEtG2KRX4oYvlo="; + hash = "sha256-j864+3c0GDDftdLqLDD0hizT54c0IgTjT77jOneXlq0="; }; postPatch = '' From 8f4e78e85df4d6520edbae8edcf7fd876be10a63 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 24 Feb 2024 21:44:38 +0000 Subject: [PATCH 126/160] ton: 2023.10 -> 2024.01 Without the change the build fails on `master` as https://hydra.nixos.org/build/249007752: In file included from /build/source/third-party/rocksdb/table/block_based/data_block_hash_index.cc:9: /build/source/third-party/rocksdb/table/block_based/data_block_hash_index.h:65:7: error: 'uint8_t' does not name a type 65 | const uint8_t kNoEntry = 255; | ^~~~~~~ --- pkgs/applications/blockchains/ton/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/ton/default.nix b/pkgs/applications/blockchains/ton/default.nix index a65a1428df0e..0d4d3826b7e7 100644 --- a/pkgs/applications/blockchains/ton/default.nix +++ b/pkgs/applications/blockchains/ton/default.nix @@ -6,21 +6,23 @@ , pkg-config , gperf , libmicrohttpd +, libsodium , openssl , readline +, secp256k1 , zlib , nix-update-script }: stdenv.mkDerivation rec { pname = "ton"; - version = "2023.10"; + version = "2024.01"; src = fetchFromGitHub { owner = "ton-blockchain"; repo = "ton"; rev = "v${version}"; - sha256 = "sha256-K1RhhW7EvwYV7/ng3NPjSGdHEQvJZ7K97YXd7s5wghc="; + hash = "sha256-nZ7yel+lTNO5zFzN711tLwAvqpf5qaYOxERwApnMVOs="; fetchSubmodules = true; }; @@ -35,14 +37,19 @@ stdenv.mkDerivation rec { buildInputs = [ gperf libmicrohttpd + libsodium openssl readline + secp256k1 zlib ]; passthru.updateScript = nix-update-script { }; meta = with lib; { + # The build fails on darwin as: + # error: aligned allocation function of type 'void *(std::size_t, std::align_val_t)' is only available on macOS 10.13 or newer + broken = stdenv.isDarwin; description = "A fully decentralized layer-1 blockchain designed by Telegram"; homepage = "https://ton.org/"; changelog = "https://github.com/ton-blockchain/ton/blob/v${version}/Changelog.md"; From 70a827d91b4b3be0d67f5a71b057c14917d34a23 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 25 Feb 2024 12:01:56 +0000 Subject: [PATCH 127/160] rubyPackages.ovirt-engine-sdk: drop upstreamed patch Without the change build fails on` master` as https://hydra.nixos.org/build/249503515: Running phase: patchPhase applying patch /nix/store/9f30k5j6jdmdycfxxkir2vv4zqhfvpvd-b596b919bc7857fdc0fc1c61a8cb7eab32cfc2db.patch patching file ext/ovirtsdk4c/ov_http_request.c Reversed (or previously applied) patch detected! Assume -R? [n] Apply anyway? [n] Skipping patch. --- pkgs/development/ruby-modules/gem-config/default.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 610ee016e6fe..f433a398d6e3 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -620,14 +620,6 @@ in ovirt-engine-sdk = attrs: { buildInputs = [ curl libxml2 ]; dontBuild = false; - patches = [ - # fix ruby 3.1 https://github.com/oVirt/ovirt-engine-sdk-ruby/pull/3 - (fetchpatch { - url = "https://github.com/oVirt/ovirt-engine-sdk-ruby/pull/3/commits/b596b919bc7857fdc0fc1c61a8cb7eab32cfc2db.patch"; - hash = "sha256-AzGTQaD/e6X4LOMuXhy/WhbayhWKYCGHXPFlzLRWyPM="; - stripLen = 1; - }) - ]; }; pango = attrs: { From d265a58fdb06657c845cc939a7cccf6f3fad8a66 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 Feb 2024 12:22:32 +0000 Subject: [PATCH 128/160] faketty: 1.0.14 -> 1.0.15 --- pkgs/tools/misc/faketty/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/faketty/default.nix b/pkgs/tools/misc/faketty/default.nix index 815eb5a631c9..d05360ccffe3 100644 --- a/pkgs/tools/misc/faketty/default.nix +++ b/pkgs/tools/misc/faketty/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "faketty"; - version = "1.0.14"; + version = "1.0.15"; src = fetchCrate { inherit pname version; - hash = "sha256-oma8Vmp1AMmEGyZG8i/ztiyYH0RrLZ/l/vXgPJs+5o0="; + hash = "sha256-f32Y9Aj4Z9y6Da9rbRgwi9BGPl4FsI790BH52cIIoPA="; }; - cargoHash = "sha256-+gojthIR5WMSjN1gCUyN0cKHWYBKBezsckVZJD7JncM="; + cargoHash = "sha256-+M1oq2CHUK6CIDFiUNLjO1UmHI19D5zdHVl8dvmQ1G8="; postPatch = '' patchShebangs tests/test.sh From f40cd5a708fd3453c4db6c5bfdc490d1ff5648d1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 Feb 2024 12:24:16 +0000 Subject: [PATCH 129/160] flow: 0.229.1 -> 0.229.2 --- pkgs/development/tools/analysis/flow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index e2626b69c55a..2585cfa3926a 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.229.1"; + version = "0.229.2"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - hash = "sha256-zovtSY37f7WKwE0Mjl9Vc+RcYjqMRhPHafN50XAj5cE="; + hash = "sha256-PoEtXk8EqlFgy33akd6na50P/tT6uWtEq+kfbayDo5s="; }; postPatch = '' From 7b389c160e4fe38419a46319e9cb160a94cf15c1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 Feb 2024 12:26:42 +0000 Subject: [PATCH 130/160] git-credential-oauth: 0.11.0 -> 0.11.1 --- .../version-management/git-credential-oauth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-credential-oauth/default.nix b/pkgs/applications/version-management/git-credential-oauth/default.nix index d04faab2a65c..66d2439a00ed 100644 --- a/pkgs/applications/version-management/git-credential-oauth/default.nix +++ b/pkgs/applications/version-management/git-credential-oauth/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "git-credential-oauth"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "hickford"; repo = pname; rev = "v${version}"; - hash = "sha256-Zxdd4JhSoaAFx8neZqdOZSZEOTtupZHnX+5ziYxbw6s="; + hash = "sha256-bqyoAAqli0L6Kf+W1sTh2vmmfaIj2OdpQyvQZnYOWWA="; }; ldflags = [ From 201096554c8a73e5b9fef0be7f167ef6319c9a7d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 Feb 2024 12:33:43 +0000 Subject: [PATCH 131/160] kodiPackages.youtube: 7.0.2.2 -> 7.0.3 --- pkgs/applications/video/kodi/addons/youtube/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/kodi/addons/youtube/default.nix b/pkgs/applications/video/kodi/addons/youtube/default.nix index 3d3683ed8776..d6bc80d0189e 100644 --- a/pkgs/applications/video/kodi/addons/youtube/default.nix +++ b/pkgs/applications/video/kodi/addons/youtube/default.nix @@ -3,13 +3,13 @@ buildKodiAddon rec { pname = "youtube"; namespace = "plugin.video.youtube"; - version = "7.0.2.2"; + version = "7.0.3"; src = fetchFromGitHub { owner = "anxdpanic"; repo = "plugin.video.youtube"; rev = "v${version}"; - hash = "sha256-BUeE/8oQYBiq4XgIp4nv0hjEQz3nnkDWCnAf4kpptwk="; + hash = "sha256-dD9jl/W8RDfYHv13TBniOeRyc4cocj8160BHWz3MKlE="; }; propagatedBuildInputs = [ From f6f64ba4fb56d09b300f70688d64302327cf3354 Mon Sep 17 00:00:00 2001 From: Kiskae Date: Thu, 1 Feb 2024 18:29:09 +0100 Subject: [PATCH 132/160] yajl: unstable-2022-04-20 -> 2.1.0-unstable-2024-02-01 --- .../yajl/cmake-shared-static-fix.patch | 89 ------------------- pkgs/development/libraries/yajl/default.nix | 11 +-- 2 files changed, 3 insertions(+), 97 deletions(-) delete mode 100644 pkgs/development/libraries/yajl/cmake-shared-static-fix.patch diff --git a/pkgs/development/libraries/yajl/cmake-shared-static-fix.patch b/pkgs/development/libraries/yajl/cmake-shared-static-fix.patch deleted file mode 100644 index 05c8f19dacbc..000000000000 --- a/pkgs/development/libraries/yajl/cmake-shared-static-fix.patch +++ /dev/null @@ -1,89 +0,0 @@ -From 768be8b9f98e30a8bd2d51576be9dfcf2cb838ea Mon Sep 17 00:00:00 2001 -From: Kiskae -Date: Tue, 26 Sep 2023 20:53:00 +0200 -Subject: [PATCH] simplify compilation of static/shared with cmake - -Signed-off-by: Kiskae ---- - CMakeLists.txt | 2 ++ - example/CMakeLists.txt | 2 +- - perf/CMakeLists.txt | 2 +- - src/CMakeLists.txt | 7 ++----- - test/parsing/CMakeLists.txt | 2 +- - 5 files changed, 7 insertions(+), 8 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 471eee13..9af25203 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -16,6 +16,8 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) - - PROJECT(YetAnotherJSONParser C) - -+option(BUILD_SHARED_LIBS "Build using shared libraries" ON) -+ - SET (YAJL_MAJOR 2) - SET (YAJL_MINOR 1) - SET (YAJL_MICRO 1) -diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt -index 0a7f6220..62ddf14c 100644 ---- a/example/CMakeLists.txt -+++ b/example/CMakeLists.txt -@@ -20,4 +20,4 @@ LINK_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/lib) - - ADD_EXECUTABLE(parse_config ${SRCS}) - --TARGET_LINK_LIBRARIES(parse_config yajl_s) -+TARGET_LINK_LIBRARIES(parse_config yajl) -diff --git a/perf/CMakeLists.txt b/perf/CMakeLists.txt -index b438d7a1..924a2681 100644 ---- a/perf/CMakeLists.txt -+++ b/perf/CMakeLists.txt -@@ -20,4 +20,4 @@ LINK_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/lib) - - ADD_EXECUTABLE(perftest ${SRCS}) - --TARGET_LINK_LIBRARIES(perftest yajl_s) -+TARGET_LINK_LIBRARIES(perftest yajl) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 789ddf99..78875032 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -35,9 +35,7 @@ SET (pkgconfigDir ${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/lib/pkgconfig - # set the output path for libraries - SET(LIBRARY_OUTPUT_PATH ${libDir}) - --ADD_LIBRARY(yajl_s STATIC ${SRCS} ${HDRS} ${PUB_HDRS}) -- --ADD_LIBRARY(yajl SHARED ${SRCS} ${HDRS} ${PUB_HDRS}) -+ADD_LIBRARY(yajl ${SRCS} ${HDRS} ${PUB_HDRS}) - - #### setup shared library version number - SET_TARGET_PROPERTIES(yajl PROPERTIES -@@ -69,7 +67,7 @@ FOREACH (header ${PUB_HDRS}) - - EXEC_PROGRAM(${CMAKE_COMMAND} ARGS -E copy_if_different ${header} ${incDir}) - -- ADD_CUSTOM_COMMAND(TARGET yajl_s POST_BUILD -+ ADD_CUSTOM_COMMAND(TARGET yajl POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${header} ${incDir}) - ENDFOREACH (header ${PUB_HDRS}) - -@@ -81,7 +79,6 @@ INSTALL(TARGETS yajl - RUNTIME DESTINATION lib${LIB_SUFFIX} - LIBRARY DESTINATION lib${LIB_SUFFIX} - ARCHIVE DESTINATION lib${LIB_SUFFIX}) --INSTALL(TARGETS yajl_s ARCHIVE DESTINATION lib${LIB_SUFFIX}) - INSTALL(FILES ${PUB_HDRS} DESTINATION include/yajl) - INSTALL(FILES ${incDir}/yajl_version.h DESTINATION include/yajl) - INSTALL(FILES ${pkgconfigDir}/yajl.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig) -diff --git a/test/parsing/CMakeLists.txt b/test/parsing/CMakeLists.txt -index c22a3887..f445920d 100644 ---- a/test/parsing/CMakeLists.txt -+++ b/test/parsing/CMakeLists.txt -@@ -20,4 +20,4 @@ LINK_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../../${YAJL_DIST_NAME}/lib) - - ADD_EXECUTABLE(yajl_test ${SRCS}) - --TARGET_LINK_LIBRARIES(yajl_test yajl_s) -+TARGET_LINK_LIBRARIES(yajl_test yajl) diff --git a/pkgs/development/libraries/yajl/default.nix b/pkgs/development/libraries/yajl/default.nix index dad884c24842..83aedce31ff8 100644 --- a/pkgs/development/libraries/yajl/default.nix +++ b/pkgs/development/libraries/yajl/default.nix @@ -2,20 +2,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "yajl"; - version = "unstable-2022-04-20"; + version = "2.1.0-unstable-2024-02-01"; src = fetchFromGitHub { owner = "containers"; repo = "yajl"; - rev = "49923ccb2143e36850bcdeb781e2bcdf5ce22f15"; - hash = "sha256-9bMPA5FpyBp8fvG/kkT/MnhYtdqg3QzOnmDFXKwJVW0="; + rev = "6bc5219389fd2752631682b0a8368e6d8218a8c5"; + hash = "sha256-vY0tqCkz6PN00Qbip5ViO64L3C06fJ4JjFuIk0TWgCo="; }; - patches = [ - # https://github.com/containers/yajl/pull/1 - ./cmake-shared-static-fix.patch - ]; - nativeBuildInputs = [ cmake ]; doCheck = true; From 4746d15434d80718b31f298b1b4cd27fdaf3ace5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 Feb 2024 13:32:59 +0000 Subject: [PATCH 133/160] python312Packages.appthreat-vulnerability-db: 5.6.2 -> 5.6.3 --- .../python-modules/appthreat-vulnerability-db/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix index 174dbc71a28a..a2257be2f428 100644 --- a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix +++ b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "appthreat-vulnerability-db"; - version = "5.6.2"; + version = "5.6.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "AppThreat"; repo = "vulnerability-db"; rev = "refs/tags/v${version}"; - hash = "sha256-/Un5Jh/3UjhJApL0eQzj545F9q+55xwFsIa5M+U93w0="; + hash = "sha256-aOHnuZdjXiIqd/SeQdVB1qB7v8DfnEFH0zHctA74MPw="; }; postPatch = '' From d3d64a08f18891b1256cd282fb39eba9bb38505e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 Feb 2024 13:53:41 +0000 Subject: [PATCH 134/160] python312Packages.teslajsonpy: 3.9.11 -> 3.10.0 --- pkgs/development/python-modules/teslajsonpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix index 30ab50da5aeb..26b1689e1ef9 100644 --- a/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/pkgs/development/python-modules/teslajsonpy/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "teslajsonpy"; - version = "3.9.11"; + version = "3.10.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "zabuldon"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-oGYXhSMwG566xdGCDMz9ajJ4HJXXcYBAJQf035iJQvE="; + hash = "sha256-7pT3LXBbE4/QRfmTWAJG6yarU787r2tjXRiv7ySvuSs="; }; nativeBuildInputs = [ From f2bbc34726a84b7fb002bbf6b4637b7aeade913f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 Feb 2024 14:23:39 +0000 Subject: [PATCH 135/160] xq: 0.3.0 -> 0.3.1 --- pkgs/tools/misc/xq/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/xq/default.nix b/pkgs/tools/misc/xq/default.nix index deddb3306440..987e5f1efc74 100644 --- a/pkgs/tools/misc/xq/default.nix +++ b/pkgs/tools/misc/xq/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "xq"; - version = "0.3.0"; + version = "0.3.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-mgvs3/gseLnFtAciW5txtYqo+8DyyQC7y/tN1kDqcb4="; + sha256 = "sha256-KR5gjRJH392s7Ue0F26slj4sRosFAAAahf6up+yOQno="; }; - cargoHash = "sha256-lSyJqGWlk3ldgAkyebuyUDLp8mJdwnw8ee6ZHQXU2Y4="; + cargoHash = "sha256-eL7VFLRfRVF2seWgHLWGudsTt5u+JcnNrJiD7K47EPA="; meta = with lib; { description = "Pure rust implementation of jq"; From 26ecd1d48ec6c9a5b91dad8604cd5f5476bb0b80 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 25 Feb 2024 15:35:04 +0100 Subject: [PATCH 136/160] prometheus-statsd-exporter: add build info Same as in 48a0dd84e8493807b7e858c8d556a25623a8af42. --- .../monitoring/prometheus/statsd-exporter.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/servers/monitoring/prometheus/statsd-exporter.nix b/pkgs/servers/monitoring/prometheus/statsd-exporter.nix index ca650c53475d..201ec3a32e36 100644 --- a/pkgs/servers/monitoring/prometheus/statsd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/statsd-exporter.nix @@ -14,6 +14,18 @@ buildGoModule rec { hash = "sha256-C7+4v40T667KJHEQ3ebLDg2wJNrxD/nossfT6rMlER8="; }; + ldflags = + let + t = "github.com/prometheus/common/version"; + in + [ "-s" "-w" + "-X ${t}.Version=${version}" + "-X ${t}.Revision=unknown" + "-X ${t}.Branch=unknown" + "-X ${t}.BuildUser=nix@nixpkgs" + "-X ${t}.BuildDate=unknown" + ]; + vendorHash = "sha256-scBpRZeECgAtpu9lnkIk1I2c8UmAkEL8LYNPUeUNYto="; meta = with lib; { From 1fbfccc78994a1674f9be5648d0f941336052fed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 Feb 2024 15:08:19 +0000 Subject: [PATCH 137/160] leatherman: 1.12.11 -> 1.12.12 --- pkgs/development/libraries/leatherman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index 47bdd0ffb480..06b528ff8cf7 100644 --- a/pkgs/development/libraries/leatherman/default.nix +++ b/pkgs/development/libraries/leatherman/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "leatherman"; - version = "1.12.11"; + version = "1.12.12"; src = fetchFromGitHub { - sha256 = "sha256-XB5qIXPe1Tu+cfxuL+HAfR9QQNiUY/noO51CVEz9hsU="; + sha256 = "sha256-V/AMdJ3ldlgBaO8gS0FOqb5tTdRGGW/+3LZq/TKkdog="; rev = version; repo = "leatherman"; owner = "puppetlabs"; From 147b07ffbb44d8128601273223b2535e4d4a076f Mon Sep 17 00:00:00 2001 From: Edu Renesto Date: Sun, 25 Feb 2024 12:54:06 -0300 Subject: [PATCH 138/160] epkowa: add plugin for Perfection V550 Photo --- pkgs/misc/drivers/epkowa/default.nix | 29 ++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/misc/drivers/epkowa/default.nix index 460ebb8a3af0..a2e3bd28f490 100644 --- a/pkgs/misc/drivers/epkowa/default.nix +++ b/pkgs/misc/drivers/epkowa/default.nix @@ -99,6 +99,35 @@ let plugins = { }; meta = common_meta // { description = "Plugin to support " + passthru.hw + " scanner in sane"; }; }; + v550 = stdenv.mkDerivation rec { + pname = "iscan-perfection-v550-bundle"; + version = "2.30.4"; + + nativeBuildInputs = [ autoPatchelfHook rpm ]; + src = fetchurl { + urls = [ + "https://download2.ebz.epson.net/iscan/plugin/perfection-v550/rpm/x64/iscan-perfection-v550-bundle-${version}.x64.rpm.tar.gz" + "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/perfection-v550/rpm/x64/iscan-perfection-v550-bundle-${version}.x64.rpm.tar.gz" + ]; + sha256 = "f8b3abf21354fc5b9bc87753cef950b6c0f07bf322a94aaff2c163bafcf50cd9"; + }; + installPhase = '' + cd plugins + ${rpm}/bin/rpm2cpio iscan-plugin-perfection-v550-*.x86_64.rpm | ${cpio}/bin/cpio -idmv + mkdir $out + cp -r usr/share $out + cp -r usr/lib64 $out/lib + mv $out/share/iscan $out/share/esci + mv $out/lib/iscan $out/lib/esci + ''; + passthru = { + registrationCommand = '' + $registry --add interpreter usb 0x04b8 0x013b "$plugin/lib/esci/libiscan-plugin-perfection-v550 $plugin/share/esci/esfweb.bin" + ''; + hw = "Perfection V550 Photo"; + }; + meta = common_meta // { description = "Plugin to support " + passthru.hw + " scanner in sane"; }; + }; v600 = stdenv.mkDerivation rec { pname = "iscan-gt-x820-bundle"; version = "2.30.4"; From b89a109b351996544b853323444ddf983846296a Mon Sep 17 00:00:00 2001 From: emilylange Date: Sun, 25 Feb 2024 17:12:26 +0100 Subject: [PATCH 139/160] drone-runner-docker: remove emilylange from maintainers I am no longer willing to maintain drone-runner-docker or any other Drone CI related software. --- .../continuous-integration/drone-runner-docker/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix b/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix index 974cd8f464cb..e4fc56d74ff2 100644 --- a/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix +++ b/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { vendorHash = "sha256-KcNp3VdJ201oxzF0bLXY4xWHqHNz54ZrVSI96cfhU+k="; meta = with lib; { - maintainers = with maintainers; [ endocrimes emilylange ]; + maintainers = with maintainers; [ endocrimes ]; license = licenses.unfreeRedistributable; homepage = "https://github.com/drone-runners/drone-runner-docker"; description = "Drone pipeline runner that executes builds inside Docker containers"; From 10c04c8796226848899db0aac741cf91d8d85483 Mon Sep 17 00:00:00 2001 From: Jose Cardoso <65740649+asininemonkey@users.noreply.github.com> Date: Sun, 25 Feb 2024 16:21:45 +0000 Subject: [PATCH 140/160] maintainers: add asininemonkey --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e920193f271e..733b196bc0e8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1743,6 +1743,12 @@ githubId = 113123021; name = "Ashvith Shetty"; }; + asininemonkey = { + email = "nixpkgs@asininemonkey.com"; + github = "asininemonkey"; + githubId = 65740649; + name = "Jose Cardoso"; + }; aske = { email = "aske@fmap.me"; github = "aske"; From cdd5ddbd085ccd4feb8b983f99d49a49e0664303 Mon Sep 17 00:00:00 2001 From: Jose Cardoso <65740649+asininemonkey@users.noreply.github.com> Date: Sun, 25 Feb 2024 16:24:50 +0000 Subject: [PATCH 141/160] arcticons-sans: init at 0.580 --- pkgs/by-name/ar/arcticons-sans/package.nix | 29 ++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 pkgs/by-name/ar/arcticons-sans/package.nix diff --git a/pkgs/by-name/ar/arcticons-sans/package.nix b/pkgs/by-name/ar/arcticons-sans/package.nix new file mode 100644 index 000000000000..fb743aceee5c --- /dev/null +++ b/pkgs/by-name/ar/arcticons-sans/package.nix @@ -0,0 +1,29 @@ +{ lib +, stdenvNoCC +, fetchzip +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "arcticons-sans"; + version = "0.580"; + + src = fetchzip { + hash = "sha256-BRyYHOuz7zxD1zD4L4DmI9dFhGePmGFDqYmS0DIbvi8="; + url = "https://github.com/arcticons-team/arcticons-font/archive/refs/tags/${finalAttrs.version}.zip"; + }; + + installPhase = '' + runHook preInstall + + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + runHook postInstall + ''; + + meta = { + description = "Arcticons Sans"; + homepage = "https://github.com/arcticons-team/arcticons-font"; + license = lib.licenses.ofl; + maintainers = with lib.maintainers; [ asininemonkey ]; + }; +}) From e3d82657a243151e58e6177b270a880d67cea41f Mon Sep 17 00:00:00 2001 From: Thane Gill Date: Thu, 15 Feb 2024 16:17:24 -0800 Subject: [PATCH 142/160] treewide: remove deprecated grub.version references --- nixos/modules/virtualisation/hyperv-image.nix | 1 - nixos/modules/virtualisation/linode-config.nix | 1 - nixos/modules/virtualisation/vmware-image.nix | 1 - 3 files changed, 3 deletions(-) diff --git a/nixos/modules/virtualisation/hyperv-image.nix b/nixos/modules/virtualisation/hyperv-image.nix index efaea0c110d2..fddff7bf1c69 100644 --- a/nixos/modules/virtualisation/hyperv-image.nix +++ b/nixos/modules/virtualisation/hyperv-image.nix @@ -60,7 +60,6 @@ in { boot.growPartition = true; boot.loader.grub = { - version = 2; device = "nodev"; efiSupport = true; efiInstallAsRemovable = true; diff --git a/nixos/modules/virtualisation/linode-config.nix b/nixos/modules/virtualisation/linode-config.nix index bbf81bda9c02..209bff57ea8b 100644 --- a/nixos/modules/virtualisation/linode-config.nix +++ b/nixos/modules/virtualisation/linode-config.nix @@ -59,7 +59,6 @@ with lib; grub = { enable = true; - version = 2; forceInstall = true; device = "nodev"; diff --git a/nixos/modules/virtualisation/vmware-image.nix b/nixos/modules/virtualisation/vmware-image.nix index a38713b4d4ee..3674b37d0b97 100644 --- a/nixos/modules/virtualisation/vmware-image.nix +++ b/nixos/modules/virtualisation/vmware-image.nix @@ -80,7 +80,6 @@ in { boot.growPartition = true; boot.loader.grub = { - version = 2; device = "nodev"; efiSupport = true; efiInstallAsRemovable = true; From 63e129f793ccf07bad4631309812a6f8ba33e234 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=A9tan=20Lepage?= <33058747+GaetanLepage@users.noreply.github.com> Date: Sun, 25 Feb 2024 18:15:04 +0100 Subject: [PATCH 143/160] buildNeovimPlugin: set version accordingly to the manual guidelines (#289008) https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md#package-naming --- pkgs/applications/editors/neovim/build-neovim-plugin.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/editors/neovim/build-neovim-plugin.nix b/pkgs/applications/editors/neovim/build-neovim-plugin.nix index 9f48d28a496a..9d9778c1fe3b 100644 --- a/pkgs/applications/editors/neovim/build-neovim-plugin.nix +++ b/pkgs/applications/editors/neovim/build-neovim-plugin.nix @@ -33,6 +33,7 @@ in nativeBuildInputs = oa.nativeBuildInputs or [] ++ [ lua.pkgs.luarocksMoveDataFolder ]; + version = "${originalLuaDrv.version}-unstable-${oa.version}"; })); in finalDrv From c1b5933e79e45dd7f75075075f6248af8362da08 Mon Sep 17 00:00:00 2001 From: Thomas Heijligen Date: Mon, 19 Feb 2024 19:17:19 +0000 Subject: [PATCH 144/160] gnatprove: Rename spark2014 Gnatprove is the tool distributed out of the spark2014 repository. AdaCore, the developer behind it, distribute it under the name gnatprove in the Ada alire package repository [0]. Rename the package to keep in line with other distribution channels. [0] https://alire.ada.dev/crates/gnatprove --- .../libraries/ada/{spark2014 => gnatprove}/default.nix | 2 +- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 8 ++++---- 3 files changed, 6 insertions(+), 5 deletions(-) rename pkgs/development/libraries/ada/{spark2014 => gnatprove}/default.nix (98%) diff --git a/pkgs/development/libraries/ada/spark2014/default.nix b/pkgs/development/libraries/ada/gnatprove/default.nix similarity index 98% rename from pkgs/development/libraries/ada/spark2014/default.nix rename to pkgs/development/libraries/ada/gnatprove/default.nix index a52a5ac63f71..ce0f3cc432c1 100644 --- a/pkgs/development/libraries/ada/spark2014/default.nix +++ b/pkgs/development/libraries/ada/gnatprove/default.nix @@ -10,7 +10,7 @@ }: stdenv.mkDerivation rec { - pname = "spark2014"; + pname = "gnatprove"; version = "unstable-2022-05-25"; src = fetchFromGitHub { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5a44235de0c3..445659c7e560 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1016,6 +1016,7 @@ mapAliases ({ spark2 = throw "'spark2' is no longer supported nixpkgs, please use 'spark'"; # Added 2023-05-08 spark_2_4 = throw "'spark_2_4' is no longer supported nixpkgs, please use 'spark'"; # Added 2023-05-08 spark_3_1 = throw "'spark_3_1' is no longer supported nixpkgs, please use 'spark'"; # Added 2023-05-08 + spark2014 = gnatprove; # Added 2024-02-25 # Added 2020-02-10 sourceHanSansPackages = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 022bc915b18d..05c3088fa5db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16075,6 +16075,10 @@ with pkgs; bintools = bintoolsDualAs; }); + gnatprove = callPackage ../development/libraries/ada/gnatprove { + ocamlPackages = ocaml-ng.ocamlPackages_4_14; + }; + gnu-smalltalk = callPackage ../development/compilers/gnu-smalltalk { }; gccgo = wrapCC (gcc.cc.override { @@ -17930,10 +17934,6 @@ with pkgs; sparkleshare = callPackage ../applications/version-management/sparkleshare { }; - spark2014 = callPackage ../development/libraries/ada/spark2014 { - ocamlPackages = ocaml-ng.ocamlPackages_4_14; - }; - spidermonkey_78 = callPackage ../development/interpreters/spidermonkey/78.nix { inherit (darwin) libobjc; }; From d22ba0a2a71cb6136115ca91999409d6498c9936 Mon Sep 17 00:00:00 2001 From: Thomas Heijligen Date: Mon, 19 Feb 2024 20:03:13 +0000 Subject: [PATCH 145/160] gnatprove: Make src dependend on gcc version Gnatprove is tightly bound to a specific gcc version. Use the gcc input version to determin which gnatprove/spark2014 sources should be used. For now gcc 12 is the only working option. gcc 13 will work as soon as all ada buildInputs can be provided as gcc 13 build. --- .../libraries/ada/gnatprove/default.nix | 47 ++++++++++++++----- 1 file changed, 35 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/ada/gnatprove/default.nix b/pkgs/development/libraries/ada/gnatprove/default.nix index ce0f3cc432c1..4e7c4d964af6 100644 --- a/pkgs/development/libraries/ada/gnatprove/default.nix +++ b/pkgs/development/libraries/ada/gnatprove/default.nix @@ -1,29 +1,52 @@ { stdenv , lib , fetchFromGitHub -, gnat12 +, gnat , gnatcoll-core , gprbuild , python3 , ocamlPackages , makeWrapper }: +let + gnat_version = lib.versions.major gnat.version; -stdenv.mkDerivation rec { - pname = "gnatprove"; - version = "unstable-2022-05-25"; - - src = fetchFromGitHub { + fetchSpark2014 = { rev, sha256 } : fetchFromGitHub { owner = "AdaCore"; repo = "spark2014"; - # commit on fsf-12 branch - rev = "ab34e07080a769b63beacc141707b5885c49d375"; - sha256 = "sha256-7pe3eWitpxmqzjW6qEIEuN0qr2IR+kJ7Ssc9pTBcCD8="; fetchSubmodules = true; + inherit rev sha256; }; + spark2014 = { + "12" = { + src = fetchSpark2014 { + rev = "ab34e07080a769b63beacc141707b5885c49d375"; # branch fsf-12 + sha256 = "sha256-7pe3eWitpxmqzjW6qEIEuN0qr2IR+kJ7Ssc9pTBcCD8="; + }; + commit_date = "2022-05-25"; + }; + "13" = { + src = fetchSpark2014 { + rev = "12db22e854defa9d1c993ef904af1e72330a68ca"; # branch fsf-13 + sha256 = "sha256-mZWP9yF1O4knCiXx8CqolnS+93bM+hTQy40cd0HZmwI="; + }; + commit_date = "2023-01-05"; + }; + }; + + thisSpark = spark2014.${gnat_version} or + (builtins.throw "GNATprove depend on a specific GNAT version and can't be built using GNAT ${gnat_version}."); + +in +stdenv.mkDerivation rec { + pname = "gnatprove"; + version = "fsf-${gnat_version}_${thisSpark.commit_date}"; + + src = thisSpark.src; + nativeBuildInputs = [ - gnat12 + gnat gprbuild python3 ocamlPackages.ocaml @@ -43,8 +66,8 @@ stdenv.mkDerivation rec { postPatch = '' # gnat2why/gnat_src points to the GNAT sources - tar xf ${gnat12.cc.src} gcc-${gnat12.cc.version}/gcc/ada - mv gcc-${gnat12.cc.version}/gcc/ada gnat2why/gnat_src + tar xf ${gnat.cc.src} gcc-${gnat.cc.version}/gcc/ada + mv gcc-${gnat.cc.version}/gcc/ada gnat2why/gnat_src ''; configurePhase = '' From c02503b58237072965308415f87e709af128516c Mon Sep 17 00:00:00 2001 From: Thomas Heijligen Date: Wed, 21 Feb 2024 21:20:59 +0000 Subject: [PATCH 146/160] gnatprove: Expose SPARKlib through gpr SPARKlib is shipped with gnatprove / spark2014 but the gpr files are in lib/gnat/. Nix gprbuild cant pick them up there. Link them to a location where gprbuild can find them. --- pkgs/development/libraries/ada/gnatprove/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/ada/gnatprove/default.nix b/pkgs/development/libraries/ada/gnatprove/default.nix index 4e7c4d964af6..884406d3342e 100644 --- a/pkgs/development/libraries/ada/gnatprove/default.nix +++ b/pkgs/development/libraries/ada/gnatprove/default.nix @@ -64,6 +64,10 @@ stdenv.mkDerivation rec { ocamlPackages.zarith ]; + propagatedBuildInputs = [ + gprbuild + ]; + postPatch = '' # gnat2why/gnat_src points to the GNAT sources tar xf ${gnat.cc.src} gcc-${gnat.cc.version}/gcc/ada @@ -77,6 +81,8 @@ stdenv.mkDerivation rec { installPhase = '' make install-all cp -a ./install/. $out + mkdir $out/share/gpr + ln -s $out/lib/gnat/* $out/share/gpr/ ''; meta = with lib; { From f2a142727cc0fbc92a9b420567418df9dd36e568 Mon Sep 17 00:00:00 2001 From: Thomas Heijligen Date: Mon, 19 Feb 2024 20:17:42 +0000 Subject: [PATCH 147/160] gnatPackages: Add scope for all ada packages Ada depencencies musst be build with the same gnat version as the project. Use a namespace as preperation to build with different gnat versions. gprbuild and gnatprove are still globaly visable. --- .../emacs/elisp-packages/elpa-packages.nix | 2 +- pkgs/build-support/cc-wrapper/default.nix | 2 +- .../ada => ada-modules}/gnatcoll/bindings.nix | 0 .../ada => ada-modules}/gnatcoll/core.nix | 0 .../ada => ada-modules}/gnatcoll/db.nix | 0 .../ada => ada-modules}/gnatprove/default.nix | 0 .../gprbuild/boot.nix | 0 .../gprbuild/default.nix | 0 .../gprbuild/gpr-project-darwin-rpath-hook.sh | 0 .../gprbuild/gpr-project-path-hook.sh | 0 .../gprbuild/gprbuild-relocatable-build.patch | 0 .../gprbuild/nixpkgs-gnat.xml | 0 .../ada => ada-modules}/xmlada/default.nix | 0 pkgs/top-level/ada-packages.nix | 45 +++++++++++++++++++ pkgs/top-level/aliases.nix | 18 +++++++- pkgs/top-level/all-packages.nix | 42 ++--------------- 16 files changed, 68 insertions(+), 41 deletions(-) rename pkgs/development/{libraries/ada => ada-modules}/gnatcoll/bindings.nix (100%) rename pkgs/development/{libraries/ada => ada-modules}/gnatcoll/core.nix (100%) rename pkgs/development/{libraries/ada => ada-modules}/gnatcoll/db.nix (100%) rename pkgs/development/{libraries/ada => ada-modules}/gnatprove/default.nix (100%) rename pkgs/development/{tools/build-managers => ada-modules}/gprbuild/boot.nix (100%) rename pkgs/development/{tools/build-managers => ada-modules}/gprbuild/default.nix (100%) rename pkgs/development/{tools/build-managers => ada-modules}/gprbuild/gpr-project-darwin-rpath-hook.sh (100%) rename pkgs/development/{tools/build-managers => ada-modules}/gprbuild/gpr-project-path-hook.sh (100%) rename pkgs/development/{tools/build-managers => ada-modules}/gprbuild/gprbuild-relocatable-build.patch (100%) rename pkgs/development/{tools/build-managers => ada-modules}/gprbuild/nixpkgs-gnat.xml (100%) rename pkgs/development/{libraries/ada => ada-modules}/xmlada/default.nix (100%) create mode 100644 pkgs/top-level/ada-packages.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix index 112445453abb..0b142281559a 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix @@ -88,7 +88,7 @@ self: let ]; buildInputs = [ - pkgs.gnatcoll-xref + pkgs.gnatPackages.gnatcoll-xref ]; buildPhase = '' diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 693c6e6fcfd4..9ff560b2286a 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -377,7 +377,7 @@ stdenv.mkDerivation { # this symlink points to the unwrapped gnat's output "out". It is used by # our custom gprconfig compiler description to find GNAT's ada runtime. See - # ../../development/tools/build-managers/gprbuild/{boot.nix, nixpkgs-gnat.xml} + # ../../development/ada-modules/gprbuild/{boot.nix, nixpkgs-gnat.xml} ln -sf ${cc} $out/nix-support/gprconfig-gnat-unwrapped '' diff --git a/pkgs/development/libraries/ada/gnatcoll/bindings.nix b/pkgs/development/ada-modules/gnatcoll/bindings.nix similarity index 100% rename from pkgs/development/libraries/ada/gnatcoll/bindings.nix rename to pkgs/development/ada-modules/gnatcoll/bindings.nix diff --git a/pkgs/development/libraries/ada/gnatcoll/core.nix b/pkgs/development/ada-modules/gnatcoll/core.nix similarity index 100% rename from pkgs/development/libraries/ada/gnatcoll/core.nix rename to pkgs/development/ada-modules/gnatcoll/core.nix diff --git a/pkgs/development/libraries/ada/gnatcoll/db.nix b/pkgs/development/ada-modules/gnatcoll/db.nix similarity index 100% rename from pkgs/development/libraries/ada/gnatcoll/db.nix rename to pkgs/development/ada-modules/gnatcoll/db.nix diff --git a/pkgs/development/libraries/ada/gnatprove/default.nix b/pkgs/development/ada-modules/gnatprove/default.nix similarity index 100% rename from pkgs/development/libraries/ada/gnatprove/default.nix rename to pkgs/development/ada-modules/gnatprove/default.nix diff --git a/pkgs/development/tools/build-managers/gprbuild/boot.nix b/pkgs/development/ada-modules/gprbuild/boot.nix similarity index 100% rename from pkgs/development/tools/build-managers/gprbuild/boot.nix rename to pkgs/development/ada-modules/gprbuild/boot.nix diff --git a/pkgs/development/tools/build-managers/gprbuild/default.nix b/pkgs/development/ada-modules/gprbuild/default.nix similarity index 100% rename from pkgs/development/tools/build-managers/gprbuild/default.nix rename to pkgs/development/ada-modules/gprbuild/default.nix diff --git a/pkgs/development/tools/build-managers/gprbuild/gpr-project-darwin-rpath-hook.sh b/pkgs/development/ada-modules/gprbuild/gpr-project-darwin-rpath-hook.sh similarity index 100% rename from pkgs/development/tools/build-managers/gprbuild/gpr-project-darwin-rpath-hook.sh rename to pkgs/development/ada-modules/gprbuild/gpr-project-darwin-rpath-hook.sh diff --git a/pkgs/development/tools/build-managers/gprbuild/gpr-project-path-hook.sh b/pkgs/development/ada-modules/gprbuild/gpr-project-path-hook.sh similarity index 100% rename from pkgs/development/tools/build-managers/gprbuild/gpr-project-path-hook.sh rename to pkgs/development/ada-modules/gprbuild/gpr-project-path-hook.sh diff --git a/pkgs/development/tools/build-managers/gprbuild/gprbuild-relocatable-build.patch b/pkgs/development/ada-modules/gprbuild/gprbuild-relocatable-build.patch similarity index 100% rename from pkgs/development/tools/build-managers/gprbuild/gprbuild-relocatable-build.patch rename to pkgs/development/ada-modules/gprbuild/gprbuild-relocatable-build.patch diff --git a/pkgs/development/tools/build-managers/gprbuild/nixpkgs-gnat.xml b/pkgs/development/ada-modules/gprbuild/nixpkgs-gnat.xml similarity index 100% rename from pkgs/development/tools/build-managers/gprbuild/nixpkgs-gnat.xml rename to pkgs/development/ada-modules/gprbuild/nixpkgs-gnat.xml diff --git a/pkgs/development/libraries/ada/xmlada/default.nix b/pkgs/development/ada-modules/xmlada/default.nix similarity index 100% rename from pkgs/development/libraries/ada/xmlada/default.nix rename to pkgs/development/ada-modules/xmlada/default.nix diff --git a/pkgs/top-level/ada-packages.nix b/pkgs/top-level/ada-packages.nix new file mode 100644 index 000000000000..2d3d0c4dc3fa --- /dev/null +++ b/pkgs/top-level/ada-packages.nix @@ -0,0 +1,45 @@ +{ lib +, pkgs +, makeScopeWithSplicing' +, generateSplicesForMkScope +, gnat +}: +let + gnat_version = lib.versions.major gnat.version; +in +makeScopeWithSplicing' { + otherSplices = generateSplicesForMkScope ("gnat" + gnat_version + "Packages"); + f = (self: { + inherit gnat; + + gprbuild-boot = self.callPackage ../development/ada-modules/gprbuild/boot.nix { }; + gprbuild = self.callPackage ../development/ada-modules/gprbuild { }; + + xmlada = self.callPackage ../development/ada-modules/xmlada { }; + + gnatprove = self.callPackage ../development/ada-modules/gnatprove { + ocamlPackages = pkgs.ocaml-ng.ocamlPackages_4_14; + }; + + gnatcoll-core = self.callPackage ../development/ada-modules/gnatcoll/core.nix { }; + + # gnatcoll-bindings repository + gnatcoll-gmp = self.callPackage ../development/ada-modules/gnatcoll/bindings.nix { component = "gmp"; }; + gnatcoll-iconv = self.callPackage ../development/ada-modules/gnatcoll/bindings.nix { component = "iconv"; }; + gnatcoll-lzma = self.callPackage ../development/ada-modules/gnatcoll/bindings.nix { component = "lzma"; }; + gnatcoll-omp = self.callPackage ../development/ada-modules/gnatcoll/bindings.nix { component = "omp"; }; + gnatcoll-python3 = self.callPackage ../development/ada-modules/gnatcoll/bindings.nix { component = "python3"; python3 = pkgs.python39; }; + gnatcoll-readline = self.callPackage ../development/ada-modules/gnatcoll/bindings.nix { component = "readline"; }; + gnatcoll-syslog = self.callPackage ../development/ada-modules/gnatcoll/bindings.nix { component = "syslog"; }; + gnatcoll-zlib = self.callPackage ../development/ada-modules/gnatcoll/bindings.nix { component = "zlib"; }; + + # gnatcoll-db repository + gnatcoll-postgres = self.callPackage ../development/ada-modules/gnatcoll/db.nix { component = "postgres"; }; + gnatcoll-sql = self.callPackage ../development/ada-modules/gnatcoll/db.nix { component = "sql"; }; + gnatcoll-sqlite = self.callPackage ../development/ada-modules/gnatcoll/db.nix { component = "sqlite"; }; + gnatcoll-xref = self.callPackage ../development/ada-modules/gnatcoll/db.nix { component = "xref"; }; + gnatcoll-db2ada = self.callPackage ../development/ada-modules/gnatcoll/db.nix { component = "gnatcoll_db2ada"; }; + gnatinspect = self.callPackage ../development/ada-modules/gnatcoll/db.nix { component = "gnatinspect"; }; + }); +} + diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 445659c7e560..67933403e2f5 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -349,6 +349,21 @@ mapAliases ({ gnatboot11 = gnat-bootstrap11; gnatboot12 = gnat-bootstrap12; gnatboot = gnat-bootstrap; + gnatcoll-core = gnatPackages.gnatcoll-core; # Added 2024-02-25 + gnatcoll-gmp = gnatPackages.gnatcoll-gmp; # Added 2024-02-25 + gnatcoll-iconv = gnatPackages.gnatcoll-iconv; # Added 2024-02-25 + gnatcoll-lzma = gnatPackages.gnatcoll-lzma; # Added 2024-02-25 + gnatcoll-omp = gnatPackages.gnatcoll-omp; # Added 2024-02-25 + gnatcoll-python3 = gnatPackages.gnatcoll-python3; # Added 2024-02-25 + gnatcoll-readline = gnatPackages.gnatcoll-readline; # Added 2024-02-25 + gnatcoll-syslog = gnatPackages.gnatcoll-syslog; # Added 2024-02-25 + gnatcoll-zlib = gnatPackages.gnatcoll-zlib; # Added 2024-02-25 + gnatcoll-postgres = gnatPackages.gnatcoll-postgres; # Added 2024-02-25 + gnatcoll-sql = gnatPackages.gnatcoll-sql; # Added 2024-02-25 + gnatcoll-sqlite = gnatPackages.gnatcoll-sqlite; # Added 2024-02-25 + gnatcoll-xref = gnatPackages.gnatcoll-xref; # Added 2024-02-25 + gnatcoll-db2ada = gnatPackages.gnatcoll-db2ada; # Added 2024-02-25 + gnatinspect = gnatPackages.gnatinspect; # Added 2024-02-25 gnome-firmware-updater = gnome-firmware; # added 2022-04-14 gnome-passwordsafe = gnome-secrets; # added 2022-01-30 gnome-mpv = throw "'gnome-mpv' has been renamed to/replaced by 'celluloid'"; # Converted to throw 2023-09-10 @@ -393,7 +408,7 @@ mapAliases ({ gocode = throw "'gocode' has been removed as the upstream project was archived. 'gopls' is suggested as replacement"; # Added 2023-12-26 govendor = throw "'govendor' has been removed as it is no longer maintained upstream, please use Go modules instead"; # Added 2023-12-26 gometer = throw "gometer has been removed from nixpkgs because goLance stopped offering Linux support"; # Added 2023-02-10 - + gprbuild-boot = gnatPackages.gprbuild-boot; # Added 2024-02-25; graalvm11-ce = throw "graalvm11-ce has been removed because upstream dropped support to different JDK versions for each GraalVM release. Please use graalvm-ce instead"; # Added 2023-09-26 graalvm17-ce = throw "graalvm17-ce has been removed because upstream dropped support to different JDK versions for each GraalVM release. Please use graalvm-ce instead"; # Added 2023-09-26 graalvm19-ce = throw "graalvm19-ce has been removed because upstream dropped support to different JDK versions for each GraalVM release. Please use graalvm-ce instead"; # Added 2023-09-26 @@ -1174,6 +1189,7 @@ mapAliases ({ xdg_utils = xdg-utils; # Added 2021-02-01 xineLib = xine-lib; # Added 2021-04-27 xineUI = xine-ui; # Added 2021-04-27 + xmlada = gnatPackages.xmlada; # Added 2024-02-25 xonsh-unwrapped = throw "'xonsh-unwrapped' was incorporated into xonsh code; call xonsh directly instead."; # Added 2024-01-20 xtrt = throw "xtrt has been removed due to being abandoned"; # Added 2023-05-25 xulrunner = firefox-unwrapped; # Added 2023-11-03 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 05c3088fa5db..531f29a4ac0d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16075,9 +16075,10 @@ with pkgs; bintools = bintoolsDualAs; }); - gnatprove = callPackage ../development/libraries/ada/gnatprove { - ocamlPackages = ocaml-ng.ocamlPackages_4_14; - }; + gnatPackages = recurseIntoAttrs (callPackage ./ada-packages.nix { gnat = buildPackages.gnat; }); + inherit (gnatPackages) + gprbuild + gnatprove; gnu-smalltalk = callPackage ../development/compilers/gnu-smalltalk { }; @@ -19117,14 +19118,6 @@ with pkgs; global = callPackage ../development/tools/misc/global { }; - gnatcoll-db2ada = callPackage ../development/libraries/ada/gnatcoll/db.nix { - component = "gnatcoll_db2ada"; - }; - - gnatinspect = callPackage ../development/libraries/ada/gnatcoll/db.nix { - component = "gnatinspect"; - }; - gnome-doc-utils = callPackage ../development/tools/documentation/gnome-doc-utils { }; gnome-desktop-testing = callPackage ../development/tools/gnome-desktop-testing { }; @@ -19169,10 +19162,6 @@ with pkgs; gotty = callPackage ../servers/gotty { }; - gprbuild-boot = callPackage ../development/tools/build-managers/gprbuild/boot.nix { }; - - gprbuild = callPackage ../development/tools/build-managers/gprbuild { }; - gputils = callPackage ../development/embedded/gputils { }; gpuvis = callPackage ../development/tools/misc/gpuvis { }; @@ -21578,27 +21567,6 @@ with pkgs; gl3w = callPackage ../development/libraries/gl3w { }; - gnatcoll-core = callPackage ../development/libraries/ada/gnatcoll/core.nix { }; - - # gnatcoll-bindings repository - gnatcoll-gmp = callPackage ../development/libraries/ada/gnatcoll/bindings.nix { component = "gmp"; }; - gnatcoll-iconv = callPackage ../development/libraries/ada/gnatcoll/bindings.nix { component = "iconv"; }; - gnatcoll-lzma = callPackage ../development/libraries/ada/gnatcoll/bindings.nix { component = "lzma"; }; - gnatcoll-omp = callPackage ../development/libraries/ada/gnatcoll/bindings.nix { component = "omp"; }; - gnatcoll-python3 = callPackage ../development/libraries/ada/gnatcoll/bindings.nix { - component = "python3"; - python3 = python39; - }; - gnatcoll-readline = callPackage ../development/libraries/ada/gnatcoll/bindings.nix { component = "readline"; }; - gnatcoll-syslog = callPackage ../development/libraries/ada/gnatcoll/bindings.nix { component = "syslog"; }; - gnatcoll-zlib = callPackage ../development/libraries/ada/gnatcoll/bindings.nix { component = "zlib"; }; - - # gnatcoll-db repository - gnatcoll-postgres = callPackage ../development/libraries/ada/gnatcoll/db.nix { component = "postgres"; }; - gnatcoll-sql = callPackage ../development/libraries/ada/gnatcoll/db.nix { component = "sql"; }; - gnatcoll-sqlite = callPackage ../development/libraries/ada/gnatcoll/db.nix { component = "sqlite"; }; - gnatcoll-xref = callPackage ../development/libraries/ada/gnatcoll/db.nix { component = "xref"; }; - gns3Packages = dontRecurseIntoAttrs (callPackage ../applications/networking/gns3 { }); gns3-gui = gns3Packages.guiStable; gns3-server = gns3Packages.serverStable; @@ -25494,8 +25462,6 @@ with pkgs; xmake-core-sv = callPackage ../development/libraries/xmake-core-sv { }; - xmlada = callPackage ../development/libraries/ada/xmlada { }; - xmlrpc_c = callPackage ../development/libraries/xmlrpc-c { }; xmlsec = callPackage ../development/libraries/xmlsec { }; From 467c84e2c68d3b16b2b70187d9dbbdd565840640 Mon Sep 17 00:00:00 2001 From: Thomas Heijligen Date: Mon, 19 Feb 2024 21:29:43 +0000 Subject: [PATCH 148/160] gnatPackages: Build all ada-modules with gnat12 and gnat13 Add namespace gnat12Packages and gnat13Packages to get ada-modules build with a specific gnat version. For gnatprove this means building the gnat12 and gnat13 version. --- pkgs/top-level/all-packages.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 531f29a4ac0d..5c01638c2092 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16003,7 +16003,7 @@ with pkgs; inherit (gnome2) libart_lgpl; }); - gnat = gnat12; + gnat = gnat12; # When changing this, update also gnatPackages gnat11 = wrapCC (gcc11.cc.override { name = "gnat"; @@ -16075,7 +16075,10 @@ with pkgs; bintools = bintoolsDualAs; }); - gnatPackages = recurseIntoAttrs (callPackage ./ada-packages.nix { gnat = buildPackages.gnat; }); + gnat12Packages = recurseIntoAttrs (callPackage ./ada-packages.nix { gnat = buildPackages.gnat12; }); + gnat13Packages = recurseIntoAttrs (callPackage ./ada-packages.nix { gnat = buildPackages.gnat13; }); + gnatPackages = gnat12Packages; + inherit (gnatPackages) gprbuild gnatprove; From 92718905bb39a0b98ad6289980f9a3fe14e88ab5 Mon Sep 17 00:00:00 2001 From: Thomas Heijligen Date: Sun, 25 Feb 2024 15:28:38 +0000 Subject: [PATCH 149/160] release-notes: Add Ada / gnatPackages changes --- nixos/doc/manual/release-notes/rl-2405.section.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index 5a5ddc30abbd..ef7085d84967 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -175,6 +175,10 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - The `cudaPackages` package scope has been updated to `cudaPackages_12`. +- Ada packages (libraries and tools) have been moved into the `gnatPackages` scope. `gnatPackages` uses the default GNAT compiler, `gnat12Packages` and `gnat13Packages` use the respective matching compiler version. + +- `spark2014` has been renamed to `gnatprove`. A version of `gnatprove` matching different GNAT versions is available from the different `gnatPackages` sets. + - `services.resolved.fallbackDns` can now be used to disable the upstream fallback servers entirely by setting it to an empty list. To get the previous behaviour of the upstream defaults set it to null, the new default, instead. - `xxd` has been moved from `vim` default output to its own output to reduce closure size. The canonical way to reference it across all platforms is `unixtools.xxd`. From 8c5a4cfa43d6d493ea12d25aca7025ce25293557 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 24 Feb 2024 16:05:07 +0100 Subject: [PATCH 150/160] gprbuild: prevent cross compiled gprbuild-boot being pulled in Building a cross-compiled gprbuild-boot would obviously not succeed. This change is kind of academic since we don't really have a working Ada cross-compiler in nixpkgs, but helps verifying changes to the gnatPackages infrastructure. --- pkgs/development/ada-modules/gprbuild/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ada-modules/gprbuild/default.nix b/pkgs/development/ada-modules/gprbuild/default.nix index aad115701263..fcb358d5fb5f 100644 --- a/pkgs/development/ada-modules/gprbuild/default.nix +++ b/pkgs/development/ada-modules/gprbuild/default.nix @@ -54,7 +54,10 @@ stdenv.mkDerivation { # link gprconfig_kb db from gprbuild-boot into build dir, # the install process copies its contents to $out preInstall = '' - ln -sf ${gprbuild-boot}/share/gprconfig share/gprconfig + # Use PATH to discover spliced gprbuild-boot from buildPackages, + # since path interpolation would give us gprbuild-boot from pkgsHostTarget + gprbuild_boot="$(dirname "$(type -p gprbuild)")/.." + ln -sf "$gprbuild_boot/share/gprconfig" share/gprconfig ''; # no need for the install script From 84e89be710698cf68c06ab97ce296e2f9eaf3e12 Mon Sep 17 00:00:00 2001 From: Hraban Luyat Date: Sun, 25 Feb 2024 12:23:58 -0500 Subject: [PATCH 151/160] sbcl: set source provenance on binary bootstrap Fixes nixos/nixpkgs#282476 --- pkgs/development/compilers/sbcl/bootstrap.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix index e23557c5a62f..d796b24e1d7e 100644 --- a/pkgs/development/compilers/sbcl/bootstrap.nix +++ b/pkgs/development/compilers/sbcl/bootstrap.nix @@ -26,4 +26,6 @@ stdenv.mkDerivation rec { postFixup = lib.optionalString (!stdenv.isAarch32 && stdenv.isLinux) '' patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $out/share/sbcl/sbcl ''; + + meta.sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; } From 3aa1a64bd26b09346ee2229ebda6b528f7a1e605 Mon Sep 17 00:00:00 2001 From: A1ca7raz <7345998+A1ca7raz@users.noreply.github.com> Date: Sun, 25 Feb 2024 01:46:51 +0800 Subject: [PATCH 152/160] homepage-dashboard: move assets to share folder --- pkgs/servers/homepage-dashboard/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/homepage-dashboard/default.nix b/pkgs/servers/homepage-dashboard/default.nix index fe1575000a2f..cc79813d08ee 100644 --- a/pkgs/servers/homepage-dashboard/default.nix +++ b/pkgs/servers/homepage-dashboard/default.nix @@ -49,17 +49,17 @@ buildNpmPackage rec { installPhase = '' runHook preInstall - mkdir -p $out - cp -r .next/standalone $out/bin - cp -r public $out/bin/public + mkdir -p $out/{share,bin} - mkdir -p $out/bin/.next - cp -r .next/static $out/bin/.next/static + cp -r .next/standalone $out/share/homepage/ + cp -r public $out/share/homepage/public - mv $out/bin/server.js $out/bin/homepage - chmod +x $out/bin/homepage + mkdir -p $out/share/homepage/.next + cp -r .next/static $out/share/homepage/.next/static - wrapProgram $out/bin/homepage \ + chmod +x $out/share/homepage/server.js + + makeWrapper $out/share/homepage/server.js $out/bin/homepage \ --set-default PORT 3000 \ --set-default HOMEPAGE_CONFIG_DIR /var/lib/homepage-dashboard From aad08e1a548ff57fa0774a8508c35f2eb2ba4c44 Mon Sep 17 00:00:00 2001 From: A1ca7raz <7345998+A1ca7raz@users.noreply.github.com> Date: Sun, 25 Feb 2024 01:59:47 +0800 Subject: [PATCH 153/160] homepage-dashboard: support local icons --- pkgs/servers/homepage-dashboard/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/servers/homepage-dashboard/default.nix b/pkgs/servers/homepage-dashboard/default.nix index cc79813d08ee..7a28803df611 100644 --- a/pkgs/servers/homepage-dashboard/default.nix +++ b/pkgs/servers/homepage-dashboard/default.nix @@ -9,8 +9,23 @@ , fetchpatch , makeBinaryWrapper , nixosTests +, enableLocalIcons ? false }: +let + dashboardIcons = fetchFromGitHub { + owner = "walkxcode"; + repo = "dashboard-icons"; + rev = "a02a5999fe56948671721da8b0830cdd5b609ed7"; # Until 2024-02-25 + hash = "sha256-s0Doh4j6CH66fZoQKMt4yc7aLStNFGMVoDp5dvs7+pk="; + }; + installLocalIcons = '' + mkdir -p $out/share/homepage/public/icons + cp ${dashboardIcons}/png/* $out/share/homepage/public/icons + cp ${dashboardIcons}/svg/* $out/share/homepage/public/icons + cp ${dashboardIcons}/LICENSE $out/share/homepage/public/icons/ + ''; +in buildNpmPackage rec { pname = "homepage-dashboard"; version = "0.8.8"; @@ -63,6 +78,8 @@ buildNpmPackage rec { --set-default PORT 3000 \ --set-default HOMEPAGE_CONFIG_DIR /var/lib/homepage-dashboard + ${if enableLocalIcons then installLocalIcons else ""} + runHook postInstall ''; From a52e27d4f637854e81dfd51da3b29627f7374513 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Tue, 20 Feb 2024 20:04:43 +0100 Subject: [PATCH 154/160] nixos/hardware/printers: fix empty ppdOptions --- nixos/modules/hardware/printers.nix | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/nixos/modules/hardware/printers.nix b/nixos/modules/hardware/printers.nix index 846ff6f3fb4f..4fb6a192cdd2 100644 --- a/nixos/modules/hardware/printers.nix +++ b/nixos/modules/hardware/printers.nix @@ -2,18 +2,23 @@ with lib; let cfg = config.hardware.printers; - ppdOptionsString = options: optionalString (options != {}) - (concatStringsSep " " - (mapAttrsToList (name: value: "-o '${name}'='${value}'") options) - ); - ensurePrinter = p: '' - ${pkgs.cups}/bin/lpadmin -p '${p.name}' -E \ - ${optionalString (p.location != null) "-L '${p.location}'"} \ - ${optionalString (p.description != null) "-D '${p.description}'"} \ - -v '${p.deviceUri}' \ - -m '${p.model}' \ - ${ppdOptionsString p.ppdOptions} + + ensurePrinter = p: let + args = cli.toGNUCommandLineShell {} ({ + p = p.name; + v = p.deviceUri; + m = p.model; + } // optionalAttrs (p.location != null) { + L = p.location; + } // optionalAttrs (p.description != null) { + D = p.description; + } // optionalAttrs (p.ppdOptions != {}) { + o = mapAttrsToList (name: value: "'${name}'='${value}'") p.ppdOptions; + }); + in '' + ${pkgs.cups}/bin/lpadmin ${args} -E ''; + ensureDefaultPrinter = name: '' ${pkgs.cups}/bin/lpadmin -d '${name}' ''; From ac85b4b653439b3ad491748a36c6d2bde1f5fa77 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Feb 2024 19:50:38 +0100 Subject: [PATCH 155/160] python311Packages.dask-awkward: adjust inputs (#291337) --- .../python-modules/dask-awkward/default.nix | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dask-awkward/default.nix b/pkgs/development/python-modules/dask-awkward/default.nix index 0875430cc383..c1a944414f6d 100644 --- a/pkgs/development/python-modules/dask-awkward/default.nix +++ b/pkgs/development/python-modules/dask-awkward/default.nix @@ -2,13 +2,19 @@ , awkward , buildPythonPackage , dask +, dask-histogram +, distributed , fetchFromGitHub , hatch-vcs , hatchling +, hist +, pandas , pyarrow , pytestCheckHook , pythonOlder , pythonRelaxDepsHook +, typing-extensions +, uproot }: buildPythonPackage rec { @@ -38,12 +44,23 @@ buildPythonPackage rec { propagatedBuildInputs = [ awkward dask + typing-extensions ]; + passthru.optional-dependencies = { + io = [ + pyarrow + ]; + }; + checkInputs = [ + dask-histogram + distributed + hist + pandas pytestCheckHook - pyarrow - ]; + uproot + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); pythonImportsCheck = [ "dask_awkward" @@ -54,6 +71,8 @@ buildPythonPackage rec { "test_remote_double" "test_remote_single" "test_from_text" + # ValueError: not a ROOT file: first four bytes... + "test_basic_root_works" ]; meta = with lib; { From 6bef3517593e1782c9877b6b1dfa13ce530ead21 Mon Sep 17 00:00:00 2001 From: h3ndrik Date: Sun, 25 Feb 2024 20:39:25 +0100 Subject: [PATCH 156/160] snapcast: compile with opus codec support (#291014) --- pkgs/applications/audio/snapcast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/snapcast/default.nix b/pkgs/applications/audio/snapcast/default.nix index d155afb99ba4..782a55864914 100644 --- a/pkgs/applications/audio/snapcast/default.nix +++ b/pkgs/applications/audio/snapcast/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, cmake, pkg-config -, alsa-lib, asio, avahi, boost179, flac, libogg, libvorbis, soxr +, alsa-lib, asio, avahi, boost179, flac, libogg, libvorbis, libopus, soxr , IOKit, AudioToolbox , aixlog, popl , pulseaudioSupport ? false, libpulseaudio @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { # not needed buildInputs = [ boost179 - asio avahi flac libogg libvorbis + asio avahi flac libogg libvorbis libopus aixlog popl soxr ] ++ lib.optional pulseaudioSupport libpulseaudio ++ lib.optional stdenv.isLinux alsa-lib From b79beadd1e07f196e082321b321aa46ce2a271d7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 19 Feb 2024 05:06:19 +0100 Subject: [PATCH 157/160] opencv4: 4.7.0 -> 4.9.0 https://github.com/opencv/opencv/wiki/ChangeLog#version490 --- pkgs/development/libraries/opencv/4.x.nix | 202 +++++++++++++--------- 1 file changed, 119 insertions(+), 83 deletions(-) diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 7bb2649ff894..2f24d984c062 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -2,14 +2,14 @@ , stdenv , fetchurl , fetchFromGitHub -, fetchpatch , cmake , pkg-config , unzip , zlib -, pcre +, pcre2 , hdf5 , boost +, glib , gflags , protobuf_21 , config @@ -35,6 +35,8 @@ , eigen , enableBlas ? true , blas +, enableVA ? !stdenv.isDarwin +, libva , enableContrib ? true , enableCuda ? config.cudaSupport @@ -58,7 +60,11 @@ , enableFfmpeg ? true , ffmpeg , enableGStreamer ? true +, elfutils , gst_all_1 +, orc +, libunwind +, zstd , enableTesseract ? false , tesseract , leptonica @@ -85,7 +91,7 @@ }@inputs: let - version = "4.7.0"; + version = "4.9.0"; # It's necessary to consistently use backendStdenv when building with CUDA # support, otherwise we get libstdc++ errors downstream @@ -96,21 +102,21 @@ let owner = "opencv"; repo = "opencv"; rev = version; - sha256 = "sha256-jUeGsu8+jzzCnIFbVMCW8DcUeGv/t1yCY/WXyW+uGDI="; + hash = "sha256-3qqu4xlRyMbPKHHTIT+iRRGtpFlcv0NU8GNZpgjdi6k="; }; contribSrc = fetchFromGitHub { owner = "opencv"; repo = "opencv_contrib"; rev = version; - sha256 = "sha256-meya0J3RdOIeMM46e/6IOVwrKn3t/c0rhwP2WQaybkE="; + hash = "sha256-K74Ghk4uDqj4OWEzDxT2R3ERi+jkAWZszzezRenfuZ8="; }; testDataSrc = fetchFromGitHub { owner = "opencv"; repo = "opencv_extra"; rev = version; - sha256 = "sha256-6hAdJdaUgtRGQanQKuY/q6fcXWXFZ3K/oLbGxvksry0="; + hash = "sha256-pActKi7aN5EOZq2Fpf5mALnZq71c037/R3Q6wJ4uCfQ="; }; # Contrib must be built in order to enable Tesseract support: @@ -121,16 +127,16 @@ let src = fetchFromGitHub { owner = "opencv"; repo = "opencv_3rdparty"; - rev = "a56b6ac6f030c312b2dce17430eef13aed9af274"; - sha256 = "1msbkc3zixx61rcg6a04i1bcfhw1phgsrh93glq1n80hgsk3nbjq"; + rev = "0cc4aa06bf2bef4b05d237c69a5a96b9cd0cb85a"; + hash = "sha256-/kHivOgCkY9YdcRRaVgytXal3ChE9xFfGAB0CfFO5ec="; } + "/ippicv"; - files = let name = platform: "ippicv_2019_${platform}_general_20180723.tgz"; in + files = let name = platform: "ippicv_2021.10.0_${platform}_20230919_general.tgz"; in if effectiveStdenv.hostPlatform.system == "x86_64-linux" then - { ${name "lnx_intel64"} = "c0bd78adb4156bbf552c1dfe90599607"; } + { ${name "lnx_intel64"} = "606a19b207ebedfe42d59fd916cc4850"; } else if effectiveStdenv.hostPlatform.system == "i686-linux" then - { ${name "lnx_ia32"} = "4f38432c30bfd6423164b7a24bbc98a0"; } + { ${name "lnx_ia32"} = "ea08487b810baad2f68aca87b74a2db9"; } else if effectiveStdenv.hostPlatform.system == "x86_64-darwin" then - { ${name "mac_intel64"} = "fe6b2bb75ae0e3f19ad3ae1a31dfa4a2"; } + { ${name "mac_intel64"} = "14f01c5a4780bfae9dde9b0aaf5e56fc"; } else throw "ICV is not available for this platform (or not yet supported by this package)"; dst = ".cache/ippicv"; @@ -142,7 +148,7 @@ let owner = "opencv"; repo = "opencv_3rdparty"; rev = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d"; - sha256 = "0r9fam8dplyqqsd3qgpnnfgf9l7lj44di19rxwbm8mxiw0rlcdvy"; + hash = "sha256-fjdGM+CxV1QX7zmF2AiR9NDknrP2PjyaxtjT21BVLmU="; }; files = { "vgg_generated_48.i" = "e8d0dcd54d1bcfdc29203d011a797179"; @@ -179,7 +185,7 @@ let owner = "opencv"; repo = "opencv_3rdparty"; rev = "8afa57abc8229d611c4937165d20e2a2d9fc5a12"; - sha256 = "061lsvqdidq9xa2hwrcvwi9ixflr2c2lfpc8drr159g68zi8bp4v"; + hash = "sha256-m9yF4kfmpRJybohdRwUTmboeU+SbZQ6F6gm32PDWNBg="; }; files = { "face_landmark_model.dat" = "7505c44ca4eb54b4ab1e4777cb96ac05"; @@ -191,10 +197,10 @@ let ade = rec { src = fetchurl { url = "https://github.com/opencv/ade/archive/${name}"; - sha256 = "sha256-TjLRbFbC7MDY9PxIy560ryviBI58cbQwqgc7A7uOHkg="; + hash = "sha256-WG/GudVpkO10kOJhoKXFMj672kggvyRYCIpezal3wcE="; }; - name = "v0.1.2a.zip"; - md5 = "fa4b3e25167319cb0fa9432ef8281945"; + name = "v0.1.2d.zip"; + md5 = "dbb095a8bf3008e91edbbf45d8d34885"; dst = ".cache/ade"; }; @@ -204,7 +210,7 @@ let owner = "opencv"; repo = "opencv_3rdparty"; rev = "a8b69ccc738421293254aec5ddb38bd523503252"; - sha256 = "sha256-/n6zHwf0Rdc4v9o4rmETzow/HTv+81DnHP+nL56XiTY="; + hash = "sha256-/n6zHwf0Rdc4v9o4rmETzow/HTv+81DnHP+nL56XiTY="; }; files = { "detect.caffemodel" = "238e2b2d6f3c18d6c3a30de0c31e23cf"; @@ -260,20 +266,6 @@ effectiveStdenv.mkDerivation { patches = [ ./cmake-don-t-use-OpenCVFindOpenEXR.patch ] ++ lib.optionals enableContrib [ - (fetchpatch { - name = "CVE-2023-2617.patch"; - url = "https://github.com/opencv/opencv_contrib/commit/ccc277247ac1a7aef0a90353edcdec35fbc5903c.patch"; - stripLen = 2; - extraPrefix = [ "opencv_contrib/" ]; - sha256 = "sha256-drZ+DVn+Pk4zAZJ+LgX5u3Tz7MU0AEI/73EVvxDP3AU="; - }) - (fetchpatch { - name = "CVE-2023-2618.patch"; - url = "https://github.com/opencv/opencv_contrib/commit/ec406fa4748fb4b0630c1b986469e7918d5e8953.patch"; - stripLen = 2; - extraPrefix = [ "opencv_contrib/" ]; - sha256 = "sha256-cB5Tsh2fDOsc0BNtSzd6U/QoCjkd9yMW1QutUU69JJ0="; - }) ] ++ lib.optional enableCuda ./cuda_opt_flow.patch; # This prevents cmake from using libraries in impure paths (which @@ -300,60 +292,104 @@ effectiveStdenv.mkDerivation { echo '"(build info elided)"' > modules/core/version_string.inc ''; - buildInputs = [ zlib pcre boost gflags protobuf_21 ] - ++ lib.optional enablePython pythonPackages.python - ++ lib.optional (effectiveStdenv.buildPlatform == effectiveStdenv.hostPlatform) hdf5 - ++ lib.optional enableGtk2 gtk2 - ++ lib.optional enableGtk3 gtk3 - ++ lib.optional enableVtk vtk - ++ lib.optional enableJPEG libjpeg - ++ lib.optional enablePNG libpng - ++ lib.optional enableTIFF libtiff - ++ lib.optional enableWebP libwebp - ++ lib.optionals enableEXR [ openexr ilmbase ] - ++ lib.optional enableJPEG2000 openjpeg - ++ lib.optional enableFfmpeg ffmpeg - ++ lib.optionals (enableFfmpeg && effectiveStdenv.isDarwin) - [ VideoDecodeAcceleration bzip2 ] - ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good ]) - ++ lib.optional enableOvis ogre - ++ lib.optional enableGPhoto2 libgphoto2 - ++ lib.optional enableDC1394 libdc1394 - ++ lib.optional enableEigen eigen - ++ lib.optional enableBlas blas.provider + buildInputs = [ + boost + gflags + glib + pcre2 + protobuf_21 + zlib + ] ++ lib.optionals enablePython [ + pythonPackages.python + ] ++ lib.optionals (effectiveStdenv.buildPlatform == effectiveStdenv.hostPlatform) [ + hdf5 + ] ++ lib.optionals enableGtk2 [ + gtk2 + ] ++ lib.optionals enableGtk3 [ + gtk3 + ] ++ lib.optionals enableVtk [ + vtk + ] ++ lib.optionals enableJPEG [ + libjpeg + ] ++ lib.optionals enablePNG [ + libpng + ] ++ lib.optionals enableTIFF [ + libtiff + ] ++ lib.optionals enableWebP [ + libwebp + ] ++ lib.optionals enableEXR [ + openexr + ilmbase + ] ++ lib.optionals enableJPEG2000 [ + openjpeg + ] ++ lib.optionals enableFfmpeg [ + ffmpeg + ] ++ lib.optionals (enableFfmpeg && effectiveStdenv.isDarwin) [ + bzip2 + VideoDecodeAcceleration + ] ++ lib.optionals (enableGStreamer && effectiveStdenv.isLinux) (with gst_all_1; [ + elfutils + gst-plugins-base + gst-plugins-good + gstreamer + libunwind + orc + zstd + ]) ++ lib.optionals enableOvis [ + ogre + ] ++ lib.optionals enableGPhoto2 [ + libgphoto2 + ] ++ lib.optionals enableDC1394 [ + libdc1394 + ] ++ lib.optionals enableEigen [ + eigen + ] ++ lib.optionals enableVA [ + libva + ] ++ lib.optionals enableBlas [ + blas.provider + ] ++ lib.optionals enableTesseract [ # There is seemingly no compile-time flag for Tesseract. It's # simply enabled automatically if contrib is built, and it detects # tesseract & leptonica. - ++ lib.optionals enableTesseract [ tesseract leptonica ] - ++ lib.optional enableTbb tbb - ++ lib.optionals effectiveStdenv.isDarwin [ - bzip2 AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox Accelerate - ] - ++ lib.optionals enableDocs [ doxygen graphviz-nox ] - ++ lib.optionals enableCuda (with cudaPackages; [ - cuda_cudart.lib - cuda_cudart.dev - cuda_cccl.dev # - libnpp.dev # npp.h - libnpp.lib - libnpp.static - nvidia-optical-flow-sdk - ] ++ lib.optionals enableCublas [ - # May start using the default $out instead once - # https://github.com/NixOS/nixpkgs/issues/271792 - # has been addressed - libcublas.static - libcublas.lib - libcublas.dev # cublas_v2.h - ] ++ lib.optionals enableCudnn [ - cudnn.dev # cudnn.h - cudnn.lib - cudnn.static - ] ++ lib.optionals enableCufft [ - libcufft.dev # cufft.h - libcufft.lib - libcufft.static - ]); + tesseract + leptonica + ] ++ lib.optionals enableTbb [ + tbb + ] ++ lib.optionals effectiveStdenv.isDarwin [ + bzip2 + AVFoundation + Cocoa + VideoDecodeAcceleration + CoreMedia + MediaToolbox + Accelerate + ] ++ lib.optionals enableDocs [ + doxygen + graphviz-nox + ] ++ lib.optionals enableCuda (with cudaPackages; [ + cuda_cudart.lib + cuda_cudart.dev + cuda_cccl.dev # + libnpp.dev # npp.h + libnpp.lib + libnpp.static + nvidia-optical-flow-sdk + ] ++ lib.optionals enableCublas [ + # May start using the default $out instead once + # https://github.com/NixOS/nixpkgs/issues/271792 + # has been addressed + libcublas.static + libcublas.lib + libcublas.dev # cublas_v2.h + ] ++ lib.optionals enableCudnn [ + cudnn.dev # cudnn.h + cudnn.lib + cudnn.static + ] ++ lib.optionals enableCufft [ + libcufft.dev # cufft.h + libcufft.lib + libcufft.static + ]); propagatedBuildInputs = lib.optionals enablePython [ pythonPackages.numpy ]; From c2563bc1ec2837e7fced3bbe78708a20f7466bd3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 24 Feb 2024 10:42:05 +0100 Subject: [PATCH 158/160] python312Packages.pillow-heif: fix build with clang --- pkgs/development/python-modules/pillow-heif/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/pillow-heif/default.nix b/pkgs/development/python-modules/pillow-heif/default.nix index 2496bd1b3609..33575ace5508 100644 --- a/pkgs/development/python-modules/pillow-heif/default.nix +++ b/pkgs/development/python-modules/pillow-heif/default.nix @@ -55,6 +55,9 @@ buildPythonPackage rec { x265 ]; + # clang-16: error: argument unused during compilation: '-fno-strict-overflow' [-Werror,-Wunused-command-line-argument] + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument"; + propagatedBuildInputs = [ pillow ]; From f43811ab19d925aea81c2de0959c79454b70062d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 Feb 2024 11:59:27 +0000 Subject: [PATCH 159/160] yubioath-flutter: 6.3.1 -> 6.4.0 --- .../misc/yubioath-flutter/default.nix | 7 ++- .../misc/yubioath-flutter/pubspec.lock.json | 51 ++++++++++--------- 2 files changed, 31 insertions(+), 27 deletions(-) diff --git a/pkgs/applications/misc/yubioath-flutter/default.nix b/pkgs/applications/misc/yubioath-flutter/default.nix index ce228abdbb22..2cc97405e3f0 100644 --- a/pkgs/applications/misc/yubioath-flutter/default.nix +++ b/pkgs/applications/misc/yubioath-flutter/default.nix @@ -13,18 +13,21 @@ flutter.buildFlutterApplication rec { pname = "yubioath-flutter"; - version = "6.3.1"; + version = "6.4.0"; src = fetchFromGitHub { owner = "Yubico"; repo = "yubioath-flutter"; rev = version; - hash = "sha256-XgRIX2Iv5niJw2NSBPwM0K4uF5sPj9c+Xj4oHtAQSbU="; + hash = "sha256-aXUnmKEUCi0rsVr3HVhEk6xa1z9HMsH+0AIY531hqiU="; }; passthru.helper = python3.pkgs.callPackage ./helper.nix { inherit src version meta; }; pubspecLock = lib.importJSON ./pubspec.lock.json; + gitHashes = { + window_manager = "sha256-mLX51nbWFccsAfcqLQIYDjYz69y9wAz4U1RZ8TIYSj0="; + }; postPatch = '' rm -f pubspec.lock diff --git a/pkgs/applications/misc/yubioath-flutter/pubspec.lock.json b/pkgs/applications/misc/yubioath-flutter/pubspec.lock.json index a1973fa9a752..c83c6ffb1caf 100644 --- a/pkgs/applications/misc/yubioath-flutter/pubspec.lock.json +++ b/pkgs/applications/misc/yubioath-flutter/pubspec.lock.json @@ -134,11 +134,11 @@ "dependency": "transitive", "description": { "name": "build_runner_core", - "sha256": "c9e32d21dd6626b5c163d48b037ce906bbe428bc23ab77bcd77bb21e593b6185", + "sha256": "4ae8ffe5ac758da294ecf1802f2aff01558d8b1b00616aa7538ea9a8a5d50799", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.2.11" + "version": "7.3.0" }, "built_collection": { "dependency": "transitive", @@ -154,11 +154,11 @@ "dependency": "transitive", "description": { "name": "built_value", - "sha256": "c9aabae0718ec394e5bc3c7272e6bb0dc0b32201a08fe185ec1d8401d3e39309", + "sha256": "a3ec2e0f967bc47f69f95009bb93db936288d61d5343b9436e378b28a2f830c6", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.8.1" + "version": "8.9.0" }, "characters": { "dependency": "transitive", @@ -264,31 +264,31 @@ "dependency": "direct dev", "description": { "name": "custom_lint", - "sha256": "dfb893ff17c83cf08676c6b64df11d3e53d80590978d7c1fb242afff3ba6dedb", + "sha256": "f89ff83efdba7c8996e86bb3bad0b759d58f9b19ae4d0e277a386ddd8b481217", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.8" + "version": "0.6.0" }, "custom_lint_builder": { "dependency": "direct dev", "description": { "name": "custom_lint_builder", - "sha256": "8df6634b38a36a6c6cb74a9c0eb02e9ba0b0ab89b29e38e6daa86e8ed2c6288d", + "sha256": "9cdd9987feaa6925ec5f98d64de4fbbb5d94248ff77bbf2489366efad6c4baef", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.8" + "version": "0.6.0" }, "custom_lint_core": { "dependency": "transitive", "description": { "name": "custom_lint_core", - "sha256": "2b235be098d157e244f18ea905a15a18c16a205e30553888fac6544bbf52f03f", + "sha256": "9003a91409c9f1db6e2e50b4870d1d5e802e5923b25f7261bf3cb3e11ea9d4fb", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.8" + "version": "0.6.0" }, "dart_style": { "dependency": "transitive", @@ -402,11 +402,11 @@ "dependency": "direct main", "description": { "name": "flutter_riverpod", - "sha256": "da9591d1f8d5881628ccd5c25c40e74fc3eef50ba45e40c3905a06e1712412d5", + "sha256": "4bce556b7ecbfea26109638d5237684538d4abc509d253e6c5c4c5733b360098", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.9" + "version": "2.4.10" }, "flutter_test": { "dependency": "direct dev", @@ -424,11 +424,11 @@ "dependency": "direct dev", "description": { "name": "freezed", - "sha256": "6c5031daae12c7072b3a87eff98983076434b4889ef2a44384d0cae3f82372ba", + "sha256": "57247f692f35f068cae297549a46a9a097100685c6780fe67177503eea5ed4e5", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.6" + "version": "2.4.7" }, "freezed_annotation": { "dependency": "direct main", @@ -645,11 +645,11 @@ "dependency": "transitive", "description": { "name": "mime", - "sha256": "e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e", + "sha256": "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.4" + "version": "1.0.5" }, "package_config": { "dependency": "transitive", @@ -834,11 +834,11 @@ "dependency": "transitive", "description": { "name": "riverpod", - "sha256": "942999ee48b899f8a46a860f1e13cee36f2f77609eb54c5b7a669bb20d550b11", + "sha256": "548e2192eb7aeb826eb89387f814edb76594f3363e2c0bb99dd733d795ba3589", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.9" + "version": "2.5.0" }, "rxdart": { "dependency": "transitive", @@ -1119,11 +1119,11 @@ "dependency": "direct main", "description": { "name": "url_launcher", - "sha256": "d25bb0ca00432a5e1ee40e69c36c85863addf7cc45e433769d61bed3fe81fd96", + "sha256": "c512655380d241a337521703af62d2c122bf7b77a46ff7dd750092aa9433499c", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.2.3" + "version": "6.2.4" }, "url_launcher_android": { "dependency": "transitive", @@ -1308,12 +1308,13 @@ "window_manager": { "dependency": "direct main", "description": { - "name": "window_manager", - "sha256": "dcc865277f26a7dad263a47d0e405d77e21f12cb71f30333a52710a408690bd7", - "url": "https://pub.dev" + "path": ".", + "ref": "2272d45bcf46d7e2b452a038906fbc85df3ce83d", + "resolved-ref": "2272d45bcf46d7e2b452a038906fbc85df3ce83d", + "url": "https://github.com/fdennis/window_manager.git" }, - "source": "hosted", - "version": "0.3.7" + "source": "git", + "version": "0.3.8" }, "xdg_directories": { "dependency": "transitive", From b4728c471861953c1c845c15512df5fba0cf020d Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sun, 25 Feb 2024 22:47:02 +0000 Subject: [PATCH 160/160] yubioath-flutter: substituteInPlace replace to replace-fail --- pkgs/applications/misc/yubioath-flutter/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/yubioath-flutter/default.nix b/pkgs/applications/misc/yubioath-flutter/default.nix index 2cc97405e3f0..4895f749ec8d 100644 --- a/pkgs/applications/misc/yubioath-flutter/default.nix +++ b/pkgs/applications/misc/yubioath-flutter/default.nix @@ -33,7 +33,7 @@ flutter.buildFlutterApplication rec { rm -f pubspec.lock substituteInPlace linux/CMakeLists.txt \ - --replace "../build/linux/helper" "${passthru.helper}/libexec/helper" + --replace-fail "../build/linux/helper" "${passthru.helper}/libexec/helper" ''; preInstall = ''