From 8a8912c1b780d45646c12e0b1c89913d37368ffa Mon Sep 17 00:00:00 2001 From: amesgen Date: Mon, 30 Sep 2024 21:39:05 +0200 Subject: [PATCH 01/56] diffnav: init at 0.2.8 --- pkgs/by-name/di/diffnav/package.nix | 41 +++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 pkgs/by-name/di/diffnav/package.nix diff --git a/pkgs/by-name/di/diffnav/package.nix b/pkgs/by-name/di/diffnav/package.nix new file mode 100644 index 000000000000..807dffc8486b --- /dev/null +++ b/pkgs/by-name/di/diffnav/package.nix @@ -0,0 +1,41 @@ +{ + lib, + fetchFromGitHub, + buildGoModule, + makeBinaryWrapper, + delta, +}: + +buildGoModule rec { + pname = "diffnav"; + version = "0.2.8"; + + src = fetchFromGitHub { + owner = "dlvhdr"; + repo = "diffnav"; + rev = "refs/tags/v${version}"; + hash = "sha256-xZAi/Ky1RjOxjhQKHvozaPTqDPcrGfhMemGWzi7WyW4="; + }; + + vendorHash = "sha256-2JjQF+fwl8+Xoq9T3jCvngRAOa3935zpi9qbF4w4hEI="; + + ldflags = [ + "-s" + "-w" + ]; + + nativeBuildInputs = [ makeBinaryWrapper ]; + postInstall = '' + wrapProgram $out/bin/diffnav \ + --prefix PATH : ${lib.makeBinPath [ delta ]} + ''; + + meta = { + changelog = "https://github.com/dlvhdr/diffnav/releases/tag/${src.rev}"; + description = "Git diff pager based on delta but with a file tree, à la GitHub"; + homepage = "https://github.com/dlvhdr/diffnav"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ amesgen ]; + mainProgram = "diffnav"; + }; +} From 9c674482d68921ed48f4e12c9270a81228df37a6 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Mon, 21 Oct 2024 09:22:24 +0200 Subject: [PATCH 02/56] syncthing: add update script Signed-off-by: Sefa Eyeoglu --- pkgs/applications/networking/syncthing/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index b87752f0412b..4578846bbed5 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -3,10 +3,10 @@ , buildGoModule , stdenv , lib -, procps , fetchFromGitHub , nixosTests , autoSignDarwinBinariesHook +, nix-update-script }: let @@ -57,8 +57,11 @@ let inherit postInstall; - passthru.tests = { - inherit (nixosTests) syncthing syncthing-init syncthing-relay; + passthru = { + tests = { + inherit (nixosTests) syncthing syncthing-init syncthing-relay; + }; + updateScript = nix-update-script { }; }; meta = { From e341cca593ead1424a06011087eb7248ea002eec Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Mon, 21 Oct 2024 09:22:36 +0200 Subject: [PATCH 03/56] syncthing: 1.27.12 -> 1.28.0 Signed-off-by: Sefa Eyeoglu --- pkgs/applications/networking/syncthing/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 4578846bbed5..10c5fda3c15c 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -13,16 +13,16 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { pname = stname; - version = "1.27.12"; + version = "1.28.0"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; - rev = "v${version}"; - hash = "sha256-/HPq71KkWUE0vG7qUBD3JON4N5KBkuRWc4SvX/JA2nQ="; + rev = "refs/tags/v${version}"; + hash = "sha256-JW78n/3hssH600uXn4YLxcIJylPbSpEZICtKmqfqamI="; }; - vendorHash = "sha256-R5GlsCkfoMc5km+NaV+TNUlM3Ot1ARcXfEFimcZOLI4="; + vendorHash = "sha256-9/PfiOSCInduQXZ47KbrD3ca9O0Zt+TP7XoX+HjwQgs="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ # Recent versions of macOS seem to require binaries to be signed when @@ -43,7 +43,7 @@ let ( export GOOS="${pkgsBuildBuild.go.GOOS}" GOARCH="${pkgsBuildBuild.go.GOARCH}" CC=$CC_FOR_BUILD go build build.go - go generate github.com/syncthing/syncthing/lib/api/auto github.com/syncthing/syncthing/cmd/strelaypoolsrv/auto + go generate github.com/syncthing/syncthing/lib/api/auto github.com/syncthing/syncthing/cmd/infra/strelaypoolsrv/auto ) ./build -goos ${go.GOOS} -goarch ${go.GOARCH} -no-upgrade -version v${version} build ${target} runHook postBuild From 77e48f97fb95554c12dd059f2960a4e25aac8a18 Mon Sep 17 00:00:00 2001 From: ssoss Date: Sun, 27 Oct 2024 17:59:07 -0500 Subject: [PATCH 04/56] recutils: additional feature flags Adds feature flags to the Nix derivation that enable support for encrypted record fields and the uuid record type within the recutils executables, and builds Bash builtins for working with recfiles. --- pkgs/by-name/re/recutils/package.nix | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/pkgs/by-name/re/recutils/package.nix b/pkgs/by-name/re/recutils/package.nix index e96375f6a0a4..61f6f60def04 100644 --- a/pkgs/by-name/re/recutils/package.nix +++ b/pkgs/by-name/re/recutils/package.nix @@ -4,6 +4,16 @@ , bc , check , curl + +, withEncryption ? true +, libgcrypt +, libgpg-error + +, withUuid ? true +, libuuid + +, withBashBuiltins ? true +, bash }: stdenv.mkDerivation rec { @@ -17,8 +27,20 @@ stdenv.mkDerivation rec { hardeningDisable = lib.optional stdenv.cc.isClang "format"; + configureFlags = + lib.optionals withBashBuiltins [ + "--with-bash-headers=${bash.dev}/include/bash" + ]; + buildInputs = [ curl + ] ++ lib.optionals withEncryption [ + libgpg-error.dev + libgcrypt.dev + ] ++ lib.optionals withUuid [ + libuuid + ] ++ lib.optionals withBashBuiltins [ + bash.dev ]; nativeCheckInputs = [ From b4368e5a4d3a04c39bd3c0f8176752b8d76e80fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 29 Oct 2024 23:29:55 +0100 Subject: [PATCH 05/56] python312Packages.pytest-django: 4.8.0 -> 4.9.0, drop pytest-xdist due causing instability Changelog: https://github.com/pytest-dev/pytest-django/blob/main/docs/changelog.rst#v490-2024-09-02 --- .../python-modules/pytest-django/default.nix | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/pkgs/development/python-modules/pytest-django/default.nix index 71e6e66c5b5b..ecd1f702d8a4 100644 --- a/pkgs/development/python-modules/pytest-django/default.nix +++ b/pkgs/development/python-modules/pytest-django/default.nix @@ -7,17 +7,17 @@ setuptools-scm, django-configurations, pytest, - pytest-xdist, pytestCheckHook, }: buildPythonPackage rec { pname = "pytest-django"; - version = "4.8.0"; + version = "4.9.0"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-XQVP4BHFbzsQ+Xj0Go77Llrfx+aA7zb7VxraHyR3nZA="; + pname = "pytest_django"; + inherit version; + hash = "sha256-i/e8NYya5vb8UbbOuxkP4gISGW5oBxIfEb1qOwNCgxQ="; }; build-system = [ @@ -31,23 +31,18 @@ buildPythonPackage rec { nativeCheckInputs = [ django-configurations - pytest-xdist + # pytest-xidst causes random errors in the form of: django.db.utils.OperationalError: no such table: app_item pytestCheckHook ]; preCheck = '' # bring pytest_django_test module into PYTHONPATH - export PYTHONPATH="$(pwd):$PYTHONPATH" + export PYTHONPATH="$PWD:$PYTHONPATH" # test the lightweight sqlite flavor export DJANGO_SETTINGS_MODULE="pytest_django_test.settings_sqlite" ''; - disabledTests = [ - # AttributeError: type object 'TestLiveServer' has no attribute '_test_settings_before_run' - "test_settings_restored" - ]; - __darwinAllowLocalNetworking = true; meta = with lib; { @@ -55,5 +50,6 @@ buildPythonPackage rec { description = "Pytest plugin for testing of Django applications"; homepage = "https://pytest-django.readthedocs.org/en/latest/"; license = licenses.bsd3; + maintainers = [ ]; }; } From 528ffc4e7fc629d835f7114acc64c0c91aeadfa6 Mon Sep 17 00:00:00 2001 From: jaredmontoya <49511278+jaredmontoya@users.noreply.github.com> Date: Wed, 30 Oct 2024 10:40:59 +0100 Subject: [PATCH 06/56] upscayl: migrate to by-name --- .../upscayl/default.nix => by-name/up/upscayl/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/graphics/upscayl/default.nix => by-name/up/upscayl/package.nix} (100%) diff --git a/pkgs/applications/graphics/upscayl/default.nix b/pkgs/by-name/up/upscayl/package.nix similarity index 100% rename from pkgs/applications/graphics/upscayl/default.nix rename to pkgs/by-name/up/upscayl/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3c39a5cd60f6..69606055cc5a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26489,8 +26489,6 @@ with pkgs; upower = callPackage ../os-specific/linux/upower { }; - upscayl = callPackage ../applications/graphics/upscayl { }; - usbguard = callPackage ../os-specific/linux/usbguard { }; usbguard-notifier = callPackage ../os-specific/linux/usbguard-notifier { }; From 6822c26a1890c9b49bb9fb29a3eaf3e024d343a3 Mon Sep 17 00:00:00 2001 From: jaredmontoya <49511278+jaredmontoya@users.noreply.github.com> Date: Wed, 30 Oct 2024 10:58:06 +0100 Subject: [PATCH 07/56] upscayl: add NIXOS_OZONE_WL --- pkgs/by-name/up/upscayl/package.nix | 53 ++++++++++++++++++----------- 1 file changed, 33 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/up/upscayl/package.nix b/pkgs/by-name/up/upscayl/package.nix index 202900983e14..414a2eb1456b 100644 --- a/pkgs/by-name/up/upscayl/package.nix +++ b/pkgs/by-name/up/upscayl/package.nix @@ -2,7 +2,10 @@ appimageTools, fetchurl, lib, -}: let + makeWrapper, +}: + +let pname = "upscayl"; version = "2.11.5"; @@ -15,27 +18,37 @@ inherit pname version src; }; in - appimageTools.wrapType2 { - inherit pname version src; +appimageTools.wrapType2 { + inherit pname version src; - extraPkgs = pkgs: [ pkgs.vulkan-headers pkgs.vulkan-loader ]; + nativeBuildInputs = [ + makeWrapper + ]; - extraInstallCommands = '' - mkdir -p $out/share/{applications,pixmaps} + extraPkgs = pkgs: [ + pkgs.vulkan-headers + pkgs.vulkan-loader + ]; - cp ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop - cp ${appimageContents}/${pname}.png $out/share/pixmaps/${pname}.png + extraInstallCommands = '' + mkdir -p $out/share/{applications,pixmaps} - substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Exec=AppRun --no-sandbox %U' 'Exec=${pname}' - ''; + cp ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop + cp ${appimageContents}/${pname}.png $out/share/pixmaps/${pname}.png - meta = with lib; { - description = "Free and Open Source AI Image Upscaler"; - homepage = "https://upscayl.github.io/"; - maintainers = with maintainers; [icy-thought]; - license = licenses.agpl3Plus; - platforms = platforms.linux; - mainProgram = "upscayl"; - }; - } + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=${pname}' + + wrapProgram $out/bin/${pname} \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + ''; + + meta = with lib; { + description = "Free and Open Source AI Image Upscaler"; + homepage = "https://upscayl.github.io/"; + maintainers = with maintainers; [ icy-thought ]; + license = licenses.agpl3Plus; + platforms = platforms.linux; + mainProgram = "upscayl"; + }; +} From a1f87962408e564a2af46cab0cd789be2d915d6c Mon Sep 17 00:00:00 2001 From: A cursed quail Date: Wed, 30 Oct 2024 16:07:30 -0500 Subject: [PATCH 08/56] beancount-language-server: 1.3.5 -> 1.3.6 Builds locally on my x86_64 nixos machine --- .../language-servers/beancount-language-server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/language-servers/beancount-language-server/default.nix b/pkgs/development/tools/language-servers/beancount-language-server/default.nix index d01732da1212..ed65cd8ee86e 100644 --- a/pkgs/development/tools/language-servers/beancount-language-server/default.nix +++ b/pkgs/development/tools/language-servers/beancount-language-server/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "beancount-language-server"; - version = "1.3.5"; + version = "1.3.6"; src = fetchFromGitHub { owner = "polarmutex"; repo = "beancount-language-server"; rev = "v${version}"; - hash = "sha256-Z8Gc3QbnFGzF1mNjlbazz7OiDpQxY3HcaBKd32XjQCY="; + hash = "sha256-U23e32Xfa0j+U/CrCZzKjipaA0Yv5szbtTHJWWL52K4="; }; - cargoHash = "sha256-WMrh4toFqd+G30ZZxC+kT/Q07gn+3p80oKECASD48wc="; + cargoHash = "sha256-OvhG+O+uHHf7e9p3vibrPt9fuGzEqG+l3GGfNwoqXBU="; doInstallCheck = true; postInstallCheck = '' From b1cce3b54ee8a653ed270ef0ae2ee783b5556bf8 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 28 Sep 2024 18:35:58 +0200 Subject: [PATCH 09/56] nixos/slurm: generate mpi.conf and add config options mpi.conf is required for PMIx configuration. Setting the PMIxCliTmpDirBase in mpi.conf per default avoids PMIx errors complaining about a missing temporary directory. --- .../services/computing/slurm/slurm.nix | 29 +++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix index f4944d3ce318..dd739798963c 100644 --- a/nixos/modules/services/computing/slurm/slurm.nix +++ b/nixos/modules/services/computing/slurm/slurm.nix @@ -32,6 +32,12 @@ let ${cfg.extraCgroupConfig} ''; + mpiConf = pkgs.writeTextDir "mpi.conf" + '' + PMIxCliTmpDirBase=${cfg.mpi.PmixCliTmpDirBase} + ${cfg.mpi.extraMpiConfig} + ''; + slurmdbdConf = pkgs.writeText "slurmdbd.conf" '' DbdHost=${cfg.dbdserver.dbdHost} @@ -45,7 +51,7 @@ let # in the same directory as slurm.conf etcSlurm = pkgs.symlinkJoin { name = "etc-slurm"; - paths = [ configFile cgroupConfig plugStackConfig ] ++ cfg.extraConfigPaths; + paths = [ configFile cgroupConfig plugStackConfig mpiConf ] ++ cfg.extraConfigPaths; }; in @@ -242,6 +248,24 @@ in ''; }; + mpi = { + PmixCliTmpDirBase = lib.mkOption { + default = "/tmp/pmix"; + type = lib.types.str; + description = '' + Base path for PMIx temporary files. + ''; + }; + + extraMpiConfig = lib.mkOption { + default = ""; + type = lib.types.lines; + description = '' + Extra configuration for that will be added to `mpi.conf`. + ''; + }; + }; + extraPlugstackConfig = lib.mkOption { default = ""; type = lib.types.lines; @@ -372,8 +396,9 @@ in }; }; - systemd.tmpfiles.rules = lib.mkIf cfg.client.enable [ + systemd.tmpfiles.rules = lib.optionals cfg.client.enable [ "d /var/spool/slurmd 755 root root -" + "d ${cfg.mpi.PmixCliTmpDirBase} 755 root root -" ]; services.openssh.settings.X11Forwarding = lib.mkIf cfg.client.enable (lib.mkDefault true); From 52a9369539b1d48cbb46fabd627b0e448d733838 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Wed, 30 Oct 2024 22:51:41 +0100 Subject: [PATCH 10/56] suricata: 7.0.6 -> 7.0.7 Fixes CVE-2024-45797, CVE-2024-47187, CVE-2024-47188, CVE-2024-47522, CVE-2024-45795 and CVE-2024-45796. https://suricata.io/2024/10/01/suricata-7-0-7-released/ --- pkgs/applications/networking/ids/suricata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/ids/suricata/default.nix b/pkgs/applications/networking/ids/suricata/default.nix index f654a96cb75d..f346b1148a30 100644 --- a/pkgs/applications/networking/ids/suricata/default.nix +++ b/pkgs/applications/networking/ids/suricata/default.nix @@ -33,11 +33,11 @@ in stdenv.mkDerivation rec { pname = "suricata"; - version = "7.0.6"; + version = "7.0.7"; src = fetchurl { url = "https://www.openinfosecfoundation.org/download/${pname}-${version}.tar.gz"; - hash = "sha256-IYJPf/Egh8DJud4gcZmnWpwxsDA2aIx8ucF48KO1f40="; + hash = "sha256-JtCjYZTVMID8iwm5mbK1qDxASfQK0H72rmnHIlpyi4Y="; }; nativeBuildInputs = [ From 32abce05f165cfc4de15bb6f9c1db4b2924f32b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Wed, 30 Oct 2024 18:46:42 +1100 Subject: [PATCH 11/56] wrangler: fix darwin builds Remove unnecessary deps, update platforms. --- pkgs/by-name/wr/wrangler/package.nix | 40 ++++++++++++++++------------ 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/wr/wrangler/package.nix b/pkgs/by-name/wr/wrangler/package.nix index 65845f5dc131..41db1bf4a379 100644 --- a/pkgs/by-name/wr/wrangler/package.nix +++ b/pkgs/by-name/wr/wrangler/package.nix @@ -27,19 +27,25 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-8EItfBV2n2rnXPCTYjDZlr/tdlEn8YOdIzOsj35w5gQ="; }; - buildInputs = [ - llvmPackages.libcxx - llvmPackages.libunwind - musl - xorg.libX11 - ]; + buildInputs = + [ + llvmPackages.libcxx + llvmPackages.libunwind + ] + ++ lib.optionals (stdenv.isLinux) [ + musl # not used, but requires extra work to remove + xorg.libX11 # for the clipboardy package + ]; - nativeBuildInputs = [ - autoPatchelfHook - makeWrapper - nodejs - pnpm_9.configHook - ]; + nativeBuildInputs = + [ + makeWrapper + nodejs + pnpm_9.configHook + ] + ++ lib.optionals (stdenv.isLinux) [ + autoPatchelfHook + ]; # @cloudflare/vitest-pool-workers wanted to run a server as part of the build process # so I simply removed it @@ -91,10 +97,10 @@ stdenv.mkDerivation (finalAttrs: { ryand56 ]; mainProgram = "wrangler"; - # cpp is required for building workerd. - # workerd is used for some wrangler subcommands. - # non-linux platforms may experience errors - # on certain subcommands due to this issue. - platforms = [ "x86_64-linux" ]; + # Tunneling and other parts of wrangler, which require workerd won't run on + # other systems where precompiled binaries are not provided, but most + # commands are will still work everywhere. + # Potential improvements: build workerd from source instead. + inherit (nodejs.meta) platforms; }; }) From 9e225c4f238ec4b98a78f73ad0fbfcb1b0858484 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 31 Oct 2024 06:30:56 +0000 Subject: [PATCH 12/56] scitokens-cpp: 1.1.1 -> 1.1.2 --- pkgs/by-name/sc/scitokens-cpp/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sc/scitokens-cpp/package.nix b/pkgs/by-name/sc/scitokens-cpp/package.nix index 56cc5ba18bb8..fee6a28bb4e5 100644 --- a/pkgs/by-name/sc/scitokens-cpp/package.nix +++ b/pkgs/by-name/sc/scitokens-cpp/package.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "scitokens-cpp"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "scitokens"; repo = "scitokens-cpp"; - rev = "v1.1.1"; - hash = "sha256-G3z9DYYWCNeA/rufNHQP3SwT5WS2AvUWm1rd8lx6XxA="; + rev = "v1.1.2"; + hash = "sha256-87mV1hyoUI/pWzRXaI051H3+FN5TXcachhgAPTtQYHg="; }; nativeBuildInputs = [ cmake pkg-config ]; From ee0e6660763bda4224a86d10d4e2dd25ffa04867 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 31 Oct 2024 06:46:36 +0000 Subject: [PATCH 13/56] gatk: 4.6.0.0 -> 4.6.1.0 --- pkgs/applications/science/biology/gatk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/gatk/default.nix b/pkgs/applications/science/biology/gatk/default.nix index 50dc0613c743..711e9e94010a 100644 --- a/pkgs/applications/science/biology/gatk/default.nix +++ b/pkgs/applications/science/biology/gatk/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "gatk"; - version = "4.6.0.0"; + version = "4.6.1.0"; src = fetchzip { url = "https://github.com/broadinstitute/gatk/releases/download/${version}/gatk-${version}.zip"; - sha256 = "sha256-AwGRkgVbG2gA4K1JG0WPr4v18JHG5YzYUKdJ2EJZX+Y="; + sha256 = "sha256-jVrFhLgHPIcWFCP3FU+LxR+UE+lVRzE6WZuLfwdL708="; }; nativeBuildInputs = [ makeWrapper ]; From da69ec31ed9d4c9002df09c921698d8e39f6ab31 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 31 Oct 2024 09:39:55 -0500 Subject: [PATCH 14/56] fastfetch: switch to apple-sdk_11 --- pkgs/by-name/fa/fastfetch/package.nix | 32 +++++++-------------------- 1 file changed, 8 insertions(+), 24 deletions(-) diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix index fa590d9a3d1d..e80dd03e2c78 100644 --- a/pkgs/by-name/fa/fastfetch/package.nix +++ b/pkgs/by-name/fa/fastfetch/package.nix @@ -2,9 +2,10 @@ lib, stdenv, fetchFromGitHub, + apple-sdk_11, chafa, cmake, - darwin, + darwinMinVersionHook, dbus, dconf, ddcutil, @@ -23,7 +24,6 @@ nix-update-script, ocl-icd, opencl-headers, - overrideSDK, pcre, pcre2, pkg-config, @@ -43,10 +43,7 @@ waylandSupport ? true, x11Support ? true, }: -let - stdenv' = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; -in -stdenv'.mkDerivation (finalAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "fastfetch"; version = "2.28.0"; @@ -105,24 +102,11 @@ stdenv'.mkDerivation (finalAttrs: { xorg.libXext ] ++ lib.optionals (x11Support && (!stdenv.hostPlatform.isDarwin)) [ xfce.xfconf ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk_11_0.frameworks; - [ - Apple80211 - AppKit - AVFoundation - Cocoa - CoreDisplay - CoreVideo - CoreWLAN - DisplayServices - IOBluetooth - MediaRemote - OpenCL - SystemConfiguration - moltenvk - ] - ); + ++ lib.optionals stdenv.hostPlatform.isDarwin ([ + apple-sdk_11 + moltenvk + (darwinMinVersionHook "10.13") + ]); cmakeFlags = [ From 9d9d717c3c35b53e05fe3056a629e36dc1f7afea Mon Sep 17 00:00:00 2001 From: RedEtherbloom Date: Fri, 1 Nov 2024 03:25:56 +0100 Subject: [PATCH 15/56] =?UTF-8?q?git-sync:=20unstable-2022-03-20=20?= =?UTF-8?q?=E2=86=92=20unstable-2024-02-15=20(#352760)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/version-management/git-sync/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-sync/default.nix b/pkgs/applications/version-management/git-sync/default.nix index 01ac29cf8c56..1534cfb81c1e 100644 --- a/pkgs/applications/version-management/git-sync/default.nix +++ b/pkgs/applications/version-management/git-sync/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "git-sync"; - version = "unstable-2022-03-20"; + version = "0-unstable-2024-02-15"; src = fetchFromGitHub { owner = "simonthum"; repo = "git-sync"; - rev = "8466b77a38b3d5e8b4ed9e3cb1b635e475eeb415"; - sha256 = "sha256-8rCwpmHV6wgFCLzPJOKzwN5mG8uD5KIlGFwcgQD+SK4="; + rev = "493b0155fb974b477b6ea623d6e41e13ddad8500"; + hash = "sha256-hsq+kpB+akjbFKBeHMsP8ibrtygEG2Yf2QW9vFFIano="; }; nativeBuildInputs = [ makeWrapper ]; From 9700c8f700f6c57c92a19744a2554ba045fe5af3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 Nov 2024 17:02:19 +0000 Subject: [PATCH 16/56] yamlfmt: 0.13.0 -> 0.14.0 --- pkgs/development/tools/yamlfmt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/yamlfmt/default.nix b/pkgs/development/tools/yamlfmt/default.nix index 0287fd6f8bd8..4798a5488fcc 100644 --- a/pkgs/development/tools/yamlfmt/default.nix +++ b/pkgs/development/tools/yamlfmt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yamlfmt"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - hash = "sha256-B1bRYG7ldewdyK8K2Yy5liQcEqv/3/67cQD8JKp8vQI="; + hash = "sha256-l9PtVaAKjtP9apTrKCkC1KDR0IXqLqinpj1onzSrPnI="; }; - vendorHash = "sha256-UfULQw7wAEJjTFp6+ACF5Ki04eFKeUEgmbt1c8pUolA="; + vendorHash = "sha256-lsNldfacBoeTPyhkjyDZhI5YR+kDke0TarfG/KdjEOg="; ldflags = [ "-s" From ac04a3ca253baa9558639ab9a03f44a000a0816c Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 1 Nov 2024 13:02:26 -0400 Subject: [PATCH 17/56] riffdiff: migrate to by-name --- .../riffdiff/default.nix => by-name/ri/riffdiff/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/text/riffdiff/default.nix => by-name/ri/riffdiff/package.nix} (100%) diff --git a/pkgs/tools/text/riffdiff/default.nix b/pkgs/by-name/ri/riffdiff/package.nix similarity index 100% rename from pkgs/tools/text/riffdiff/default.nix rename to pkgs/by-name/ri/riffdiff/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a1f7c2b7d27e..34bef17b5252 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18186,8 +18186,6 @@ with pkgs; riff = callPackage ../development/tools/misc/riff { }; - riffdiff = callPackage ../tools/text/riffdiff {}; - rman = callPackage ../development/tools/misc/rman { }; rnginline = with python3Packages; toPythonApplication rnginline; From 49872f3ca66e2570881cb5881a767eeeae489b73 Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 1 Nov 2024 13:02:46 -0400 Subject: [PATCH 18/56] riffdiff: format with nixfmt --- pkgs/by-name/ri/riffdiff/package.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ri/riffdiff/package.nix b/pkgs/by-name/ri/riffdiff/package.nix index 481a75e1bd12..3e5474d229d5 100644 --- a/pkgs/by-name/ri/riffdiff/package.nix +++ b/pkgs/by-name/ri/riffdiff/package.nix @@ -1,4 +1,8 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ + lib, + rustPlatform, + fetchFromGitHub, +}: rustPlatform.buildRustPackage rec { pname = "riffdiff"; From 67dee65a8724f2b76d9c37c6761ded9ce96d7203 Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 1 Nov 2024 13:03:44 -0400 Subject: [PATCH 19/56] riffdiff: use best practices --- pkgs/by-name/ri/riffdiff/package.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ri/riffdiff/package.nix b/pkgs/by-name/ri/riffdiff/package.nix index 3e5474d229d5..939705da864b 100644 --- a/pkgs/by-name/ri/riffdiff/package.nix +++ b/pkgs/by-name/ri/riffdiff/package.nix @@ -2,6 +2,9 @@ lib, rustPlatform, fetchFromGitHub, + nix-update-script, + riffdiff, + testers, }: rustPlatform.buildRustPackage rec { @@ -11,17 +14,23 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "walles"; repo = "riff"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-IdYQ8vD3ZIzqdNY4JtR8f2huV/DWOhV8FUn7tuRe7IQ="; }; cargoHash = "sha256-1on4CTstEvjNLtk1RG6dcNl0XhaPYAy+U0DYn/aVzEg="; - meta = with lib; { + passthru = { + tests.version = testers.testVersion { package = riffdiff; }; + updateScript = nix-update-script { }; + }; + + meta = { description = "Diff filter highlighting which line parts have changed"; homepage = "https://github.com/walles/riff"; - license = licenses.mit; - maintainers = with maintainers; [ johnpyp ]; + changelog = "https://github.com/walles/riff/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ johnpyp ]; mainProgram = "riff"; }; } From a0266126ce657b5db22c2c6e749e4efff6d8c7be Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 1 Nov 2024 13:04:04 -0400 Subject: [PATCH 20/56] riffdiff: add getchoo to maintainers --- pkgs/by-name/ri/riffdiff/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ri/riffdiff/package.nix b/pkgs/by-name/ri/riffdiff/package.nix index 939705da864b..d015f56ff5b7 100644 --- a/pkgs/by-name/ri/riffdiff/package.nix +++ b/pkgs/by-name/ri/riffdiff/package.nix @@ -30,7 +30,10 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/walles/riff"; changelog = "https://github.com/walles/riff/releases/tag/${version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ johnpyp ]; + maintainers = with lib.maintainers; [ + johnpyp + getchoo + ]; mainProgram = "riff"; }; } From 4071a3089eed66ace39c750331016c9b850cf6a8 Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 1 Nov 2024 13:08:24 -0400 Subject: [PATCH 21/56] riffdiff: 3.3.3 -> 3.3.6 Diff: https://github.com/walles/riff/compare/refs/tags/3.3.3...3.3.6 Changelog: https://github.com/walles/riff/releases/tag/3.3.6 --- pkgs/by-name/ri/riffdiff/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ri/riffdiff/package.nix b/pkgs/by-name/ri/riffdiff/package.nix index d015f56ff5b7..eecc8e3e57b0 100644 --- a/pkgs/by-name/ri/riffdiff/package.nix +++ b/pkgs/by-name/ri/riffdiff/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "riffdiff"; - version = "3.3.3"; + version = "3.3.6"; src = fetchFromGitHub { owner = "walles"; repo = "riff"; rev = "refs/tags/${version}"; - hash = "sha256-IdYQ8vD3ZIzqdNY4JtR8f2huV/DWOhV8FUn7tuRe7IQ="; + hash = "sha256-qXFSO2VIPaGnB+5Wp/u0FTcKnpcMLxW6uNykKL681lU="; }; - cargoHash = "sha256-1on4CTstEvjNLtk1RG6dcNl0XhaPYAy+U0DYn/aVzEg="; + cargoHash = "sha256-i6/wa2/ogyLwLBdIXqTYdJX9+SFf+p7Zm2j2Q3mje6w="; passthru = { tests.version = testers.testVersion { package = riffdiff; }; From 21aa632317757c7c9abf07940343cd26677f17d6 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Tue, 22 Oct 2024 16:11:30 +0200 Subject: [PATCH 22/56] nextcloudPackages.apps.files_mindmap: init at 0.0.30; nextcloudPackages: update --- pkgs/servers/nextcloud/packages/28.json | 20 ++++++++++++++----- pkgs/servers/nextcloud/packages/29.json | 6 +++--- pkgs/servers/nextcloud/packages/30.json | 6 +++--- .../nextcloud/packages/nextcloud-apps.json | 1 + 4 files changed, 22 insertions(+), 11 deletions(-) diff --git a/pkgs/servers/nextcloud/packages/28.json b/pkgs/servers/nextcloud/packages/28.json index aa86bf6ef42b..e36ddf610741 100644 --- a/pkgs/servers/nextcloud/packages/28.json +++ b/pkgs/servers/nextcloud/packages/28.json @@ -69,6 +69,16 @@ "agpl" ] }, + "files_mindmap": { + "hash": "sha256-VsaJT3lsPqnCmgLYkkdLhyIRmi/CumEdezsvhra2NQk=", + "url": "https://github.com/ACTom/files_mindmap/releases/download/v0.0.30/files_mindmap-0.0.30.tar.gz", + "version": "0.0.30", + "description": "This application enables Nextcloud users to open, save and edit mind map files in the web browser. If enabled, an entry in the New button at the top of the web browser the Mindmap file entry appears. When clicked, a new mindmap file opens in the browser and the file can be saved into the current Nextcloud directory.", + "homepage": "https://github.com/ACTom/files_mindmap", + "licenses": [ + "agpl" + ] + }, "forms": { "hash": "sha256-iU2bqojO+pvMvKDiw+ANMvsH71Ul+8yQ+uNvJfa1ngc=", "url": "https://github.com/nextcloud-releases/forms/releases/download/v4.3.2/forms-v4.3.2.tar.gz", @@ -140,8 +150,8 @@ ] }, "maps": { - "hash": "sha256-FmRhpPRpMnCHkJFaVvQuR6Y7Pd7vpP+tUVih919g/fQ=", - "url": "https://github.com/nextcloud/maps/releases/download/v1.4.0-1-nightly/maps-1.4.0-1-nightly.tar.gz", + "hash": "sha256-BmXs6Oepwnm+Cviy4awm3S8P9AiJTt1BnAQNb4TxVYE=", + "url": "https://github.com/nextcloud/maps/releases/download/v1.4.0/maps-1.4.0.tar.gz", "version": "1.4.0", "description": "**The whole world fits inside your cloud!**\n\n- **🗺 Beautiful map:** Using [OpenStreetMap](https://www.openstreetmap.org) and [Leaflet](https://leafletjs.com), you can choose between standard map, satellite, topographical, dark mode or even watercolor! 🎨\n- **⭐ Favorites:** Save your favorite places, privately! Sync with [GNOME Maps](https://github.com/nextcloud/maps/issues/30) and mobile apps is planned.\n- **🧭 Routing:** Possible using either [OSRM](http://project-osrm.org), [GraphHopper](https://www.graphhopper.com) or [Mapbox](https://www.mapbox.com).\n- **🖼 Photos on the map:** No more boring slideshows, just show directly where you were!\n- **🙋 Contacts on the map:** See where your friends live and plan your next visit.\n- **📱 Devices:** Lost your phone? Check the map!\n- **〰 Tracks:** Load GPS tracks or past trips. Recording with [PhoneTrack](https://f-droid.org/en/packages/net.eneiluj.nextcloud.phonetrack/) or [OwnTracks](https://owntracks.org) is planned.", "homepage": "https://github.com/nextcloud/maps", @@ -190,9 +200,9 @@ ] }, "onlyoffice": { - "hash": "sha256-YkYsD/14syHOaxWEwBKgGGV0i5WlYJbGcqesLsWnimc=", - "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.4.0/onlyoffice.tar.gz", - "version": "9.4.0", + "hash": "sha256-YXj0tHU++S7YDMYj/Eg5KsSX3qBSYtyuPZfiOBQ8cjk=", + "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.5.0/onlyoffice.tar.gz", + "version": "9.5.0", "description": "ONLYOFFICE connector allows you to view, edit and collaborate on text documents, spreadsheets and presentations within Nextcloud using ONLYOFFICE Docs. This will create a new Edit in ONLYOFFICE action within the document library for Office documents. This allows multiple users to co-author documents in real time from the familiar web interface and save the changes back to your file storage.", "homepage": "https://www.onlyoffice.com", "licenses": [ diff --git a/pkgs/servers/nextcloud/packages/29.json b/pkgs/servers/nextcloud/packages/29.json index b1547ac6fe2a..c3f94e98759a 100644 --- a/pkgs/servers/nextcloud/packages/29.json +++ b/pkgs/servers/nextcloud/packages/29.json @@ -190,9 +190,9 @@ ] }, "onlyoffice": { - "hash": "sha256-YkYsD/14syHOaxWEwBKgGGV0i5WlYJbGcqesLsWnimc=", - "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.4.0/onlyoffice.tar.gz", - "version": "9.4.0", + "hash": "sha256-YXj0tHU++S7YDMYj/Eg5KsSX3qBSYtyuPZfiOBQ8cjk=", + "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.5.0/onlyoffice.tar.gz", + "version": "9.5.0", "description": "ONLYOFFICE connector allows you to view, edit and collaborate on text documents, spreadsheets and presentations within Nextcloud using ONLYOFFICE Docs. This will create a new Edit in ONLYOFFICE action within the document library for Office documents. This allows multiple users to co-author documents in real time from the familiar web interface and save the changes back to your file storage.", "homepage": "https://www.onlyoffice.com", "licenses": [ diff --git a/pkgs/servers/nextcloud/packages/30.json b/pkgs/servers/nextcloud/packages/30.json index 3c87426cdd1f..817f954c833b 100644 --- a/pkgs/servers/nextcloud/packages/30.json +++ b/pkgs/servers/nextcloud/packages/30.json @@ -180,9 +180,9 @@ ] }, "onlyoffice": { - "hash": "sha256-YkYsD/14syHOaxWEwBKgGGV0i5WlYJbGcqesLsWnimc=", - "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.4.0/onlyoffice.tar.gz", - "version": "9.4.0", + "hash": "sha256-YXj0tHU++S7YDMYj/Eg5KsSX3qBSYtyuPZfiOBQ8cjk=", + "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.5.0/onlyoffice.tar.gz", + "version": "9.5.0", "description": "ONLYOFFICE connector allows you to view, edit and collaborate on text documents, spreadsheets and presentations within Nextcloud using ONLYOFFICE Docs. This will create a new Edit in ONLYOFFICE action within the document library for Office documents. This allows multiple users to co-author documents in real time from the familiar web interface and save the changes back to your file storage.", "homepage": "https://www.onlyoffice.com", "licenses": [ diff --git a/pkgs/servers/nextcloud/packages/nextcloud-apps.json b/pkgs/servers/nextcloud/packages/nextcloud-apps.json index b9c1d623164a..4ccbeb32eb04 100644 --- a/pkgs/servers/nextcloud/packages/nextcloud-apps.json +++ b/pkgs/servers/nextcloud/packages/nextcloud-apps.json @@ -8,6 +8,7 @@ , "end_to_end_encryption": "agpl3Plus" , "files_texteditor": "agpl3Plus" , "files_markdown": "agpl3Plus" +, "files_mindmap": "agpl3Plus" , "forms": "agpl3Plus" , "gpoddersync": "agpl3Only" , "groupfolders": "agpl3Plus" From 033a0a5c41e6a00c041c1db0b995bdd64debc353 Mon Sep 17 00:00:00 2001 From: Pascal Dietrich Date: Sat, 2 Nov 2024 00:24:09 +0100 Subject: [PATCH 23/56] morewaita-icon-theme: 45 -> 47.1 --- pkgs/by-name/mo/morewaita-icon-theme/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mo/morewaita-icon-theme/package.nix b/pkgs/by-name/mo/morewaita-icon-theme/package.nix index d5668ce5428a..77ca0a63f023 100644 --- a/pkgs/by-name/mo/morewaita-icon-theme/package.nix +++ b/pkgs/by-name/mo/morewaita-icon-theme/package.nix @@ -7,13 +7,13 @@ }: stdenvNoCC.mkDerivation rec { pname = "morewaita-icon-theme"; - version = "45"; + version = "47.1"; src = fetchFromGitHub { owner = "somepaulo"; repo = "MoreWaita"; - rev = "v${version}"; - hash = "sha256-UtwigqJjkin53Wg3PU14Rde6V42eKhmP26a3fDpbJ4Y="; + rev = "${version}"; + hash = "sha256-/ANzNQi+H2UzRlLrMBBMxEA/TGNpCwf8lNn6sHEKfQE="; }; nativeBuildInputs = [ From aeeb4c2f57db30ef16938d08c0c2972c1455fc20 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 31 Oct 2024 18:53:35 -0500 Subject: [PATCH 24/56] fastfetch: apple-sdk_11 -> apple-sdk_15 Upstream uses ifdefs and @available checks for SDK features so bump to latest SDK and set minimum. --- pkgs/by-name/fa/fastfetch/package.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix index e80dd03e2c78..38b1c3f9c5b9 100644 --- a/pkgs/by-name/fa/fastfetch/package.nix +++ b/pkgs/by-name/fa/fastfetch/package.nix @@ -2,10 +2,9 @@ lib, stdenv, fetchFromGitHub, - apple-sdk_11, + apple-sdk_15, chafa, cmake, - darwinMinVersionHook, dbus, dconf, ddcutil, @@ -103,9 +102,8 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals (x11Support && (!stdenv.hostPlatform.isDarwin)) [ xfce.xfconf ] ++ lib.optionals stdenv.hostPlatform.isDarwin ([ - apple-sdk_11 + apple-sdk_15 moltenvk - (darwinMinVersionHook "10.13") ]); cmakeFlags = From 8e829c0d333afc7691259d1583f045c69b734063 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 31 Oct 2024 19:05:05 -0500 Subject: [PATCH 25/56] fastfetch: use versionCheckHook No longer need manual version checking test and can verify on build. --- pkgs/by-name/fa/fastfetch/package.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix index 38b1c3f9c5b9..e7195db779c9 100644 --- a/pkgs/by-name/fa/fastfetch/package.nix +++ b/pkgs/by-name/fa/fastfetch/package.nix @@ -29,8 +29,8 @@ python3, rpm, sqlite, - testers, util-linux, + versionCheckHook, vulkan-loader, wayland, xfce, @@ -140,14 +140,11 @@ stdenv.mkDerivation (finalAttrs: { --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}" ''; - passthru = { - updateScript = nix-update-script { }; - tests.version = testers.testVersion { - package = finalAttrs.finalPackage; - command = "fastfetch -v | cut -d '(' -f 1"; - version = "fastfetch ${finalAttrs.version}"; - }; - }; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; meta = { description = "An actively maintained, feature-rich and performance oriented, neofetch like system information tool"; From 91774627c2d863c196f13972ac04c40ff8218d49 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 2 Nov 2024 09:38:50 +0100 Subject: [PATCH 26/56] yamlfmt: refactor --- pkgs/development/tools/yamlfmt/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/yamlfmt/default.nix b/pkgs/development/tools/yamlfmt/default.nix index 4798a5488fcc..039e54c1b130 100644 --- a/pkgs/development/tools/yamlfmt/default.nix +++ b/pkgs/development/tools/yamlfmt/default.nix @@ -1,4 +1,10 @@ -{ lib, buildGoModule, fetchFromGitHub, testers, yamlfmt }: +{ + lib, + buildGoModule, + fetchFromGitHub, + testers, + yamlfmt, +}: buildGoModule rec { pname = "yamlfmt"; @@ -6,8 +12,8 @@ buildGoModule rec { src = fetchFromGitHub { owner = "google"; - repo = pname; - rev = "v${version}"; + repo = "yamlfmt"; + rev = "refs/tags/v${version}"; hash = "sha256-l9PtVaAKjtP9apTrKCkC1KDR0IXqLqinpj1onzSrPnI="; }; @@ -16,8 +22,8 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X main.version=${version}" - "-X main.commit=${src.rev}" + "-X=main.version=${version}" + "-X=main.commit=${src.rev}" ]; passthru.tests.version = testers.testVersion { @@ -27,6 +33,7 @@ buildGoModule rec { meta = with lib; { description = "Extensible command line tool or library to format yaml files"; homepage = "https://github.com/google/yamlfmt"; + changelog = "https://github.com/google/yamlfmt/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ sno2wman ]; mainProgram = "yamlfmt"; From 2f4f315b3308d1c18b22bb116c38e24f793face6 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Sun, 20 Oct 2024 09:20:12 +0000 Subject: [PATCH 27/56] python3Packages.django-elasticsearch-dsl: init at 8.0 --- .../django-elasticsearch-dsl/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/django-elasticsearch-dsl/default.nix diff --git a/pkgs/development/python-modules/django-elasticsearch-dsl/default.nix b/pkgs/development/python-modules/django-elasticsearch-dsl/default.nix new file mode 100644 index 000000000000..55664730b5e7 --- /dev/null +++ b/pkgs/development/python-modules/django-elasticsearch-dsl/default.nix @@ -0,0 +1,45 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + elasticsearch-dsl, + django, + pythonOlder, + elastic-transport, + setuptools, +}: + +buildPythonPackage rec { + pname = "django-elasticsearch-dsl"; + version = "8.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "django-es"; + repo = "django-elasticsearch-dsl"; + rev = "refs/tags/${version}"; + hash = "sha256-GizdFOM4UjI870XdE33D7uXHXkuv/bLYbyi9yyNjti8="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + django + elasticsearch-dsl + elastic-transport + ]; + + # Tests require running Elasticsearch daemon + doCheck = false; + + pythonImportsCheck = [ "django_elasticsearch_dsl" ]; + + meta = { + description = "Wrapper around elasticsearch-dsl-py for Django models"; + homepage = "https://github.com/sabricot/django-elasticsearch-dsl"; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.onny ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ae8070db1bb9..af706d0ea5bb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3388,6 +3388,8 @@ self: super: with self; { django-dynamic-preferences = callPackage ../development/python-modules/django-dynamic-preferences { }; + django-elasticsearch-dsl = callPackage ../development/python-modules/django-elasticsearch-dsl { }; + django-encrypted-model-fields = callPackage ../development/python-modules/django-encrypted-model-fields { }; django-environ = callPackage ../development/python-modules/django-environ { }; From 089b42ea867f297e61db29ef7ed56652745b2d99 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 1 Nov 2024 10:56:33 -0500 Subject: [PATCH 28/56] tabby: darwin sdk refactor Use macos 15 since upstream CI is tied to macos-latest github action runner. --- pkgs/by-name/ta/tabby/package.nix | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/pkgs/by-name/ta/tabby/package.nix b/pkgs/by-name/ta/tabby/package.nix index 03179482b4d8..273387813e11 100644 --- a/pkgs/by-name/ta/tabby/package.nix +++ b/pkgs/by-name/ta/tabby/package.nix @@ -13,17 +13,15 @@ llama-cpp, + apple-sdk_15, autoAddDriverRunpath, + versionCheckHook, + cudaSupport ? config.cudaSupport, - rocmSupport ? config.rocmSupport, - - darwin, metalSupport ? stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64, - # one of [ null "cpu" "rocm" "cuda" "metal" ]; acceleration ? null, - versionCheckHook, }: let @@ -106,19 +104,9 @@ let # TODO(ghthor): some of this can be removed darwinBuildInputs = [ llamaccpPackage ] - ++ optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Foundation - Accelerate - CoreVideo - CoreGraphics - ] - ++ optionals enableMetal [ - Metal - MetalKit - ] - ); + ++ optionals stdenv.hostPlatform.isDarwin ([ + apple-sdk_15 + ]); cudaBuildInputs = [ llamaccpPackage ]; rocmBuildInputs = [ llamaccpPackage ]; From 3fe4bdd2139edf1df860ac240c9aeca75a3d90f8 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 2 Nov 2024 18:20:57 -0500 Subject: [PATCH 29/56] tabby: 0.18.0 -> 0.19.0 --- pkgs/by-name/ta/tabby/Cargo.lock | 35 ++++++++++++++++--------------- pkgs/by-name/ta/tabby/package.nix | 4 ++-- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/ta/tabby/Cargo.lock b/pkgs/by-name/ta/tabby/Cargo.lock index e310f97d2622..3bc79f2f32b2 100644 --- a/pkgs/by-name/ta/tabby/Cargo.lock +++ b/pkgs/by-name/ta/tabby/Cargo.lock @@ -41,7 +41,7 @@ dependencies = [ [[package]] name = "aim-downloader" -version = "0.18.0" +version = "0.19.0" dependencies = [ "async-stream", "clap", @@ -1691,7 +1691,7 @@ dependencies = [ [[package]] name = "hash-ids" -version = "0.18.0" +version = "0.19.0" [[package]] name = "hashbrown" @@ -1875,7 +1875,7 @@ dependencies = [ [[package]] name = "http-api-bindings" -version = "0.18.0" +version = "0.19.0" dependencies = [ "anyhow", "async-openai", @@ -2538,7 +2538,7 @@ checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "llama-cpp-server" -version = "0.18.0" +version = "0.19.0" dependencies = [ "anyhow", "async-openai", @@ -3066,7 +3066,7 @@ dependencies = [ [[package]] name = "ollama-api-bindings" -version = "0.18.0" +version = "0.19.0" dependencies = [ "anyhow", "async-stream", @@ -4980,7 +4980,7 @@ dependencies = [ [[package]] name = "tabby" -version = "0.18.0" +version = "0.19.0" dependencies = [ "anyhow", "assert-json-diff", @@ -5030,7 +5030,7 @@ dependencies = [ [[package]] name = "tabby-common" -version = "0.18.0" +version = "0.19.0" dependencies = [ "anyhow", "async-trait", @@ -5058,7 +5058,7 @@ dependencies = [ [[package]] name = "tabby-crawler" -version = "0.18.0" +version = "0.19.0" dependencies = [ "anyhow", "async-stream", @@ -5077,7 +5077,7 @@ dependencies = [ [[package]] name = "tabby-db" -version = "0.18.0" +version = "0.19.0" dependencies = [ "anyhow", "assert_matches", @@ -5095,7 +5095,7 @@ dependencies = [ [[package]] name = "tabby-db-macros" -version = "0.18.0" +version = "0.19.0" dependencies = [ "quote", "syn 2.0.66", @@ -5103,10 +5103,11 @@ dependencies = [ [[package]] name = "tabby-download" -version = "0.18.0" +version = "0.19.0" dependencies = [ "aim-downloader", "anyhow", + "serial_test 3.1.1", "tabby-common", "tokio-retry", "tracing", @@ -5114,7 +5115,7 @@ dependencies = [ [[package]] name = "tabby-git" -version = "0.18.0" +version = "0.19.0" dependencies = [ "anyhow", "assert_matches", @@ -5135,7 +5136,7 @@ dependencies = [ [[package]] name = "tabby-index" -version = "0.18.0" +version = "0.19.0" dependencies = [ "anyhow", "async-stream", @@ -5177,7 +5178,7 @@ dependencies = [ [[package]] name = "tabby-index-cli" -version = "0.18.0" +version = "0.19.0" dependencies = [ "anyhow", "clap", @@ -5189,7 +5190,7 @@ dependencies = [ [[package]] name = "tabby-inference" -version = "0.18.0" +version = "0.19.0" dependencies = [ "anyhow", "async-openai", @@ -5206,7 +5207,7 @@ dependencies = [ [[package]] name = "tabby-schema" -version = "0.18.0" +version = "0.19.0" dependencies = [ "anyhow", "async-trait", @@ -5231,7 +5232,7 @@ dependencies = [ [[package]] name = "tabby-webserver" -version = "0.18.0" +version = "0.19.0" dependencies = [ "anyhow", "argon2", diff --git a/pkgs/by-name/ta/tabby/package.nix b/pkgs/by-name/ta/tabby/package.nix index 273387813e11..725cbb669f66 100644 --- a/pkgs/by-name/ta/tabby/package.nix +++ b/pkgs/by-name/ta/tabby/package.nix @@ -31,7 +31,7 @@ let # https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/ollama/default.nix pname = "tabby"; - version = "0.18.0"; + version = "0.19.0"; availableAccelerations = flatten [ (optional cudaSupport "cuda") @@ -120,7 +120,7 @@ rustPlatform.buildRustPackage { owner = "TabbyML"; repo = "tabby"; rev = "refs/tags/v${version}"; - hash = "sha256-8clEBWAT+HI2eecOsmldgRcA58Ehq9bZT4ZwUMm494g="; + hash = "sha256-RK81gQ5IUzZ4HXJbKBr5bqayH0Xip6ZVAgdMwqP+kx8="; fetchSubmodules = true; }; From ff8d740e864d0f2ce73e74a3bc625f05155d8308 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 3 Nov 2024 02:48:49 +0000 Subject: [PATCH 30/56] makima: 0.9.3 -> 0.9.4 --- pkgs/by-name/ma/makima/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/makima/package.nix b/pkgs/by-name/ma/makima/package.nix index 804eecde7685..678d5ff9d064 100644 --- a/pkgs/by-name/ma/makima/package.nix +++ b/pkgs/by-name/ma/makima/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec{ pname = "makima"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "cyber-sushi"; repo = "makima"; rev = "v${version}"; - hash = "sha256-esZCFMeIRoafR7vQbnyf3Mo18trVZdIy9rvAvTHfrLA="; + hash = "sha256-cmn86ocN8DwxS9WpcHxWMjuFPAMmM60Q6jmyeBmdrPg="; }; - cargoHash = "sha256-NXiK+cimQaYpzY3WSHUlYUWcXOLWQ5TwGuZKh+OB+go="; + cargoHash = "sha256-/eM+clDZRlvfFa1eEwLo8CKEvnOq5CW19RNvbEbxVE8="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ udev ]; From c3c04bf9ddf6ccc461ac66f008664e201c2591a4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 3 Nov 2024 04:05:05 +0000 Subject: [PATCH 31/56] python312Packages.xonsh: 0.18.3 -> 0.18.4 --- pkgs/by-name/xo/xonsh/unwrapped.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/xo/xonsh/unwrapped.nix b/pkgs/by-name/xo/xonsh/unwrapped.nix index 90afc4ddbcbd..ce0533d0200d 100644 --- a/pkgs/by-name/xo/xonsh/unwrapped.nix +++ b/pkgs/by-name/xo/xonsh/unwrapped.nix @@ -12,7 +12,7 @@ let argset = { pname = "xonsh"; - version = "0.18.3"; + version = "0.18.4"; pyproject = true; # PyPI package ships incomplete tests @@ -20,7 +20,7 @@ let owner = "xonsh"; repo = "xonsh"; rev = "refs/tags/${argset.version}"; - hash = "sha256-MJTsYnuFENHLDDMIWcs0IRcBmWs4XyfDWDG7AY2P6cM="; + hash = "sha256-L5UwmwwM42E3l+sIBwXgMf/q5r22cUoRbE2cqM09bZA="; }; nativeBuildInputs = with pythonPackages; [ From ec5881151cfe27e080d7a3e8f25672d83c0a1f44 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Wed, 25 Sep 2024 15:48:57 +0800 Subject: [PATCH 32/56] fprintd: nixfmt; move to by-name; fprintd-tod: nixfmt; move to by-name; libprint: nixfmt; move to by-name --- pkgs/by-name/fp/fprintd-tod/package.nix | 59 +++++++++++++++ .../fp/fprintd/package.nix} | 73 ++++++++++--------- ...skip-test-test_removal_during_enroll.patch | 0 .../li/libfprint/package.nix} | 53 ++++++++------ pkgs/tools/security/fprintd/tod.nix | 56 -------------- pkgs/top-level/all-packages.nix | 6 -- 6 files changed, 127 insertions(+), 120 deletions(-) create mode 100644 pkgs/by-name/fp/fprintd-tod/package.nix rename pkgs/{tools/security/fprintd/default.nix => by-name/fp/fprintd/package.nix} (76%) rename pkgs/{tools/security => by-name/fp}/fprintd/skip-test-test_removal_during_enroll.patch (100%) rename pkgs/{development/libraries/libfprint/default.nix => by-name/li/libfprint/package.nix} (74%) delete mode 100644 pkgs/tools/security/fprintd/tod.nix diff --git a/pkgs/by-name/fp/fprintd-tod/package.nix b/pkgs/by-name/fp/fprintd-tod/package.nix new file mode 100644 index 000000000000..78906bfd0815 --- /dev/null +++ b/pkgs/by-name/fp/fprintd-tod/package.nix @@ -0,0 +1,59 @@ +{ + lib, + fetchFromGitLab, + fetchpatch, + fprintd, + libfprint-tod, +}: + +(fprintd.override { libfprint = libfprint-tod; }).overrideAttrs (oldAttrs: finalAttrs:{ + pname = "fprintd-tod"; + version = "1.90.9"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "libfprint"; + repo = "fprintd"; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-rOTVThHOY/Q2IIu2RGiv26UE2V/JFfWWnfKZQfKl5Mg="; + }; + + patches = oldAttrs.patches or [ ] ++ [ + (fetchpatch { + name = "use-more-idiomatic-correct-embedded-shell-scripting"; + url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/f4256533d1ffdc203c3f8c6ee42e8dcde470a93f.patch"; + sha256 = "sha256-4uPrYEgJyXU4zx2V3gwKKLaD6ty0wylSriHlvKvOhek="; + }) + (fetchpatch { + name = "remove-pointless-copying-of-files-into-build-directory"; + url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/2c34cef5ef2004d8479475db5523c572eb409a6b.patch"; + sha256 = "sha256-2pZBbMF1xjoDKn/jCAIldbeR2JNEVduXB8bqUrj2Ih4="; + }) + (fetchpatch { + name = "build-Do-not-use-positional-arguments-in-i18n.merge_file"; + url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/50943b1bd4f18d103c35233f0446ce7a31d1817e.patch"; + sha256 = "sha256-ANkAq6fr0VRjkS0ckvf/ddVB2mH4b2uJRTI4H8vPPes="; + }) + (fetchpatch { + name = "tests-Fix-dbusmock-AddDevice-calls-to-include-option"; + url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/ae04fa989720279e5558c3b8ff9ebe1959b1cf36.patch"; + sha256 = "sha256-jW5vlzrbZQ1gUDLBf7G50GnZfZxhlnL2Eu+9Bghdwdw="; + }) + ]; + + postPatch = + oldAttrs.postPatch or "" + + '' + # part of "remove-pointless-copying-of-files-into-build-directory" but git-apply doesn't handle renaming + mv src/device.xml src/net.reactivated.Fprint.Device.xml + mv src/manager.xml src/net.reactivated.Fprint.Manager.xml + ''; + + meta = { + homepage = "https://fprint.freedesktop.org/"; + description = "fprintd built with libfprint-tod to support Touch OEM Drivers"; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ hmenke ]; + }; +}) diff --git a/pkgs/tools/security/fprintd/default.nix b/pkgs/by-name/fp/fprintd/package.nix similarity index 76% rename from pkgs/tools/security/fprintd/default.nix rename to pkgs/by-name/fp/fprintd/package.nix index 71951b59a6db..aeddeebba167 100644 --- a/pkgs/tools/security/fprintd/default.nix +++ b/pkgs/by-name/fp/fprintd/package.nix @@ -1,37 +1,42 @@ -{ lib, stdenv -, fetchFromGitLab -, pkg-config -, gobject-introspection -, meson -, ninja -, perl -, gettext -, gtk-doc -, libxslt -, docbook-xsl-nons -, docbook_xml_dtd_412 -, glib -, gusb -, dbus -, polkit -, nss -, pam -, systemd -, libfprint -, python3 +{ + lib, + stdenv, + fetchFromGitLab, + pkg-config, + gobject-introspection, + meson, + ninja, + perl, + gettext, + gtk-doc, + libxslt, + docbook-xsl-nons, + docbook_xml_dtd_412, + glib, + gusb, + dbus, + polkit, + nss, + pam, + systemd, + libfprint, + python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fprintd"; version = "1.94.4"; - outputs = [ "out" "devdoc" ]; + outputs = [ + "out" + "devdoc" + ]; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "libfprint"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-B2g2d29jSER30OUqCkdk3+Hv5T3DA4SUKoyiqHb8FeU="; + repo = "fprintd"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-B2g2d29jSER30OUqCkdk3+Hv5T3DA4SUKoyiqHb8FeU="; }; nativeBuildInputs = [ @@ -41,6 +46,7 @@ stdenv.mkDerivation rec { perl # for pod2man gettext gtk-doc + python3 libxslt dbus docbook-xsl-nons @@ -81,11 +87,10 @@ stdenv.mkDerivation rec { # FIXME: Ugly hack for tests to find libpam_wrapper.so LIBRARY_PATH = lib.makeLibraryPath [ python3.pkgs.pypamtest ]; - doCheck = true; - mesonCheckFlags = [ # PAM related checks are timing out - "--no-suite" "fprintd:TestPamFprintd" + "--no-suite" + "fprintd:TestPamFprintd" ]; patches = [ @@ -107,11 +112,11 @@ stdenv.mkDerivation rec { --replace "'G_DEBUG=fatal-criticals'," "" ''; - meta = with lib; { + meta = { homepage = "https://fprint.freedesktop.org/"; description = "D-Bus daemon that offers libfprint functionality over the D-Bus interprocess communication bus"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ abbradar ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ abbradar ]; }; -} +}) diff --git a/pkgs/tools/security/fprintd/skip-test-test_removal_during_enroll.patch b/pkgs/by-name/fp/fprintd/skip-test-test_removal_during_enroll.patch similarity index 100% rename from pkgs/tools/security/fprintd/skip-test-test_removal_during_enroll.patch rename to pkgs/by-name/fp/fprintd/skip-test-test_removal_during_enroll.patch diff --git a/pkgs/development/libraries/libfprint/default.nix b/pkgs/by-name/li/libfprint/package.nix similarity index 74% rename from pkgs/development/libraries/libfprint/default.nix rename to pkgs/by-name/li/libfprint/package.nix index 3c1b14eaf909..9ab0f0ebb4a1 100644 --- a/pkgs/development/libraries/libfprint/default.nix +++ b/pkgs/by-name/li/libfprint/package.nix @@ -1,31 +1,36 @@ -{ lib, stdenv -, fetchFromGitLab -, pkg-config -, meson -, python3 -, ninja -, gusb -, pixman -, glib -, nss -, gobject-introspection -, cairo -, libgudev -, gtk-doc -, docbook-xsl-nons -, docbook_xml_dtd_43 +{ + lib, + stdenv, + fetchFromGitLab, + pkg-config, + meson, + python3, + ninja, + gusb, + pixman, + glib, + nss, + gobject-introspection, + cairo, + libgudev, + gtk-doc, + docbook-xsl-nons, + docbook_xml_dtd_43, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs:{ pname = "libfprint"; version = "1.94.6"; - outputs = [ "out" "devdoc" ]; + outputs = [ + "out" + "devdoc" + ]; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "libfprint"; repo = pname; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-lDnAXWukBZSo8X6UEVR2nOMeVUi/ahnJgx2cP+vykZ8="; }; @@ -82,11 +87,11 @@ stdenv.mkDerivation rec { runHook postInstallCheck ''; - meta = with lib; { + meta = { homepage = "https://fprint.freedesktop.org/"; description = "Library designed to make it easy to add support for consumer fingerprint readers"; - license = licenses.lgpl21Only; - platforms = platforms.linux; - maintainers = with maintainers; [ abbradar ]; + license = lib.licenses.lgpl21Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ abbradar ]; }; -} +}) diff --git a/pkgs/tools/security/fprintd/tod.nix b/pkgs/tools/security/fprintd/tod.nix deleted file mode 100644 index 633985989b3a..000000000000 --- a/pkgs/tools/security/fprintd/tod.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib -, fetchFromGitLab -, fetchpatch -, fprintd -, libfprint-tod -}: - -(fprintd.override { libfprint = libfprint-tod; }).overrideAttrs (oldAttrs: rec { - pname = "fprintd-tod"; - version = "1.90.9"; - - src = fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "libfprint"; - repo = "fprintd"; - rev = "v${version}"; - sha256 = "sha256-rOTVThHOY/Q2IIu2RGiv26UE2V/JFfWWnfKZQfKl5Mg="; - }; - - patches = oldAttrs.patches or [] ++ [ - (fetchpatch { - name = "use-more-idiomatic-correct-embedded-shell-scripting"; - url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/f4256533d1ffdc203c3f8c6ee42e8dcde470a93f.patch"; - sha256 = "sha256-4uPrYEgJyXU4zx2V3gwKKLaD6ty0wylSriHlvKvOhek="; - }) - (fetchpatch { - name = "remove-pointless-copying-of-files-into-build-directory"; - url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/2c34cef5ef2004d8479475db5523c572eb409a6b.patch"; - sha256 = "sha256-2pZBbMF1xjoDKn/jCAIldbeR2JNEVduXB8bqUrj2Ih4="; - }) - (fetchpatch { - name = "build-Do-not-use-positional-arguments-in-i18n.merge_file"; - url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/50943b1bd4f18d103c35233f0446ce7a31d1817e.patch"; - sha256 = "sha256-ANkAq6fr0VRjkS0ckvf/ddVB2mH4b2uJRTI4H8vPPes="; - }) - (fetchpatch { - name = "tests-Fix-dbusmock-AddDevice-calls-to-include-option"; - url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/ae04fa989720279e5558c3b8ff9ebe1959b1cf36.patch"; - sha256 = "sha256-jW5vlzrbZQ1gUDLBf7G50GnZfZxhlnL2Eu+9Bghdwdw="; - }) - ]; - - postPatch = oldAttrs.postPatch or "" + '' - # part of "remove-pointless-copying-of-files-into-build-directory" but git-apply doesn't handle renaming - mv src/device.xml src/net.reactivated.Fprint.Device.xml - mv src/manager.xml src/net.reactivated.Fprint.Manager.xml - ''; - - meta = { - homepage = "https://fprint.freedesktop.org/"; - description = "fprintd built with libfprint-tod to support Touch OEM Drivers"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ hmenke ]; - }; - }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f17b22d3023..cedda01f3494 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7586,10 +7586,6 @@ with pkgs; fpm = callPackage ../tools/package-management/fpm { }; - fprintd = callPackage ../tools/security/fprintd { }; - - fprintd-tod = callPackage ../tools/security/fprintd/tod.nix { }; - ferdium = callPackage ../applications/networking/instant-messengers/ferdium { mkFranzDerivation = callPackage ../applications/networking/instant-messengers/franz/generic.nix { }; }; @@ -20675,8 +20671,6 @@ with pkgs; extraOnly = true; }; - libfprint = callPackage ../development/libraries/libfprint { }; - libfprint-tod = callPackage ../development/libraries/libfprint-tod { }; libfprint-2-tod1-goodix = callPackage ../development/libraries/libfprint-2-tod1-goodix { }; From aec7ee7bc385a027ba656a357c20a6c5dad1850d Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Wed, 25 Sep 2024 16:04:31 +0800 Subject: [PATCH 33/56] libfprint: 1.94.6 -> 1.94.8 --- pkgs/by-name/li/libfprint/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/libfprint/package.nix b/pkgs/by-name/li/libfprint/package.nix index 9ab0f0ebb4a1..29e6ef700af2 100644 --- a/pkgs/by-name/li/libfprint/package.nix +++ b/pkgs/by-name/li/libfprint/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs:{ pname = "libfprint"; - version = "1.94.6"; + version = "1.94.8"; outputs = [ "out" "devdoc" @@ -29,9 +29,9 @@ stdenv.mkDerivation (finalAttrs:{ src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "libfprint"; - repo = pname; + repo = "libfprint"; rev = "v${finalAttrs.version}"; - hash = "sha256-lDnAXWukBZSo8X6UEVR2nOMeVUi/ahnJgx2cP+vykZ8="; + hash = "sha256-PZr4ZeVnuCKYfI8CKvRqBwalxsz9Ka17kSuLflwl7mE="; }; postPatch = '' From fd4188aaa92789d4d3be11e6b0283264a8011b89 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Wed, 25 Sep 2024 16:10:35 +0800 Subject: [PATCH 34/56] fprint: 1.94.3 -> 1.94.4 --- pkgs/by-name/fp/fprintd-tod/package.nix | 96 +++++++++++++------------ pkgs/by-name/li/libfprint/package.nix | 2 +- 2 files changed, 50 insertions(+), 48 deletions(-) diff --git a/pkgs/by-name/fp/fprintd-tod/package.nix b/pkgs/by-name/fp/fprintd-tod/package.nix index 78906bfd0815..3f8d369efa09 100644 --- a/pkgs/by-name/fp/fprintd-tod/package.nix +++ b/pkgs/by-name/fp/fprintd-tod/package.nix @@ -6,54 +6,56 @@ libfprint-tod, }: -(fprintd.override { libfprint = libfprint-tod; }).overrideAttrs (oldAttrs: finalAttrs:{ - pname = "fprintd-tod"; - version = "1.90.9"; +(fprintd.override { libfprint = libfprint-tod; }).overrideAttrs ( + finalAttrs: previousAttrs: { + pname = "fprintd-tod"; + version = "1.90.9"; - src = fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "libfprint"; - repo = "fprintd"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-rOTVThHOY/Q2IIu2RGiv26UE2V/JFfWWnfKZQfKl5Mg="; - }; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "libfprint"; + repo = "fprintd"; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-rOTVThHOY/Q2IIu2RGiv26UE2V/JFfWWnfKZQfKl5Mg="; + }; - patches = oldAttrs.patches or [ ] ++ [ - (fetchpatch { - name = "use-more-idiomatic-correct-embedded-shell-scripting"; - url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/f4256533d1ffdc203c3f8c6ee42e8dcde470a93f.patch"; - sha256 = "sha256-4uPrYEgJyXU4zx2V3gwKKLaD6ty0wylSriHlvKvOhek="; - }) - (fetchpatch { - name = "remove-pointless-copying-of-files-into-build-directory"; - url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/2c34cef5ef2004d8479475db5523c572eb409a6b.patch"; - sha256 = "sha256-2pZBbMF1xjoDKn/jCAIldbeR2JNEVduXB8bqUrj2Ih4="; - }) - (fetchpatch { - name = "build-Do-not-use-positional-arguments-in-i18n.merge_file"; - url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/50943b1bd4f18d103c35233f0446ce7a31d1817e.patch"; - sha256 = "sha256-ANkAq6fr0VRjkS0ckvf/ddVB2mH4b2uJRTI4H8vPPes="; - }) - (fetchpatch { - name = "tests-Fix-dbusmock-AddDevice-calls-to-include-option"; - url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/ae04fa989720279e5558c3b8ff9ebe1959b1cf36.patch"; - sha256 = "sha256-jW5vlzrbZQ1gUDLBf7G50GnZfZxhlnL2Eu+9Bghdwdw="; - }) - ]; + patches = previousAttrs.patches or [ ] ++ [ + (fetchpatch { + name = "use-more-idiomatic-correct-embedded-shell-scripting"; + url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/f4256533d1ffdc203c3f8c6ee42e8dcde470a93f.patch"; + sha256 = "sha256-4uPrYEgJyXU4zx2V3gwKKLaD6ty0wylSriHlvKvOhek="; + }) + (fetchpatch { + name = "remove-pointless-copying-of-files-into-build-directory"; + url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/2c34cef5ef2004d8479475db5523c572eb409a6b.patch"; + sha256 = "sha256-2pZBbMF1xjoDKn/jCAIldbeR2JNEVduXB8bqUrj2Ih4="; + }) + (fetchpatch { + name = "build-Do-not-use-positional-arguments-in-i18n.merge_file"; + url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/50943b1bd4f18d103c35233f0446ce7a31d1817e.patch"; + sha256 = "sha256-ANkAq6fr0VRjkS0ckvf/ddVB2mH4b2uJRTI4H8vPPes="; + }) + (fetchpatch { + name = "tests-Fix-dbusmock-AddDevice-calls-to-include-option"; + url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/ae04fa989720279e5558c3b8ff9ebe1959b1cf36.patch"; + sha256 = "sha256-jW5vlzrbZQ1gUDLBf7G50GnZfZxhlnL2Eu+9Bghdwdw="; + }) + ]; - postPatch = - oldAttrs.postPatch or "" - + '' - # part of "remove-pointless-copying-of-files-into-build-directory" but git-apply doesn't handle renaming - mv src/device.xml src/net.reactivated.Fprint.Device.xml - mv src/manager.xml src/net.reactivated.Fprint.Manager.xml - ''; + postPatch = + previousAttrs.postPatch or "" + + '' + # part of "remove-pointless-copying-of-files-into-build-directory" but git-apply doesn't handle renaming + mv src/device.xml src/net.reactivated.Fprint.Device.xml + mv src/manager.xml src/net.reactivated.Fprint.Manager.xml + ''; - meta = { - homepage = "https://fprint.freedesktop.org/"; - description = "fprintd built with libfprint-tod to support Touch OEM Drivers"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ hmenke ]; - }; -}) + meta = { + homepage = "https://fprint.freedesktop.org/"; + description = "fprintd built with libfprint-tod to support Touch OEM Drivers"; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ hmenke ]; + }; + } +) diff --git a/pkgs/by-name/li/libfprint/package.nix b/pkgs/by-name/li/libfprint/package.nix index 29e6ef700af2..7e0894f6b97b 100644 --- a/pkgs/by-name/li/libfprint/package.nix +++ b/pkgs/by-name/li/libfprint/package.nix @@ -18,7 +18,7 @@ docbook_xml_dtd_43, }: -stdenv.mkDerivation (finalAttrs:{ +stdenv.mkDerivation (finalAttrs: { pname = "libfprint"; version = "1.94.8"; outputs = [ From 6e3333cf802f66442b2c91aefab92878ab4be2ef Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Tue, 29 Oct 2024 16:54:36 +0800 Subject: [PATCH 35/56] fprintd-tod: fix build --- pkgs/by-name/fp/fprintd-tod/package.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/by-name/fp/fprintd-tod/package.nix b/pkgs/by-name/fp/fprintd-tod/package.nix index 3f8d369efa09..bb34e1b88de2 100644 --- a/pkgs/by-name/fp/fprintd-tod/package.nix +++ b/pkgs/by-name/fp/fprintd-tod/package.nix @@ -2,8 +2,13 @@ lib, fetchFromGitLab, fetchpatch, + libxml2, fprintd, libfprint-tod, + python3Packages, + libpam-wrapper, + gusb, + gobject-introspection, }: (fprintd.override { libfprint = libfprint-tod; }).overrideAttrs ( @@ -19,6 +24,19 @@ sha256 = "sha256-rOTVThHOY/Q2IIu2RGiv26UE2V/JFfWWnfKZQfKl5Mg="; }; + nativeBuildInputs = previousAttrs.nativeBuildInputs or [ ] ++ [ + libpam-wrapper + python3Packages.python + python3Packages.pycairo + python3Packages.dbus-python + python3Packages.python-dbusmock + python3Packages.pygobject3 + gusb + python3Packages.pypamtest + gobject-introspection + libxml2 # for xmllint + ]; + patches = previousAttrs.patches or [ ] ++ [ (fetchpatch { name = "use-more-idiomatic-correct-embedded-shell-scripting"; From c941941cacc54c486c23101e5c5e67cea053e611 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Sun, 3 Nov 2024 09:23:22 +0100 Subject: [PATCH 36/56] tere: fix tests on darwin --- pkgs/tools/misc/tere/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/tere/default.nix b/pkgs/tools/misc/tere/default.nix index 905c197cc732..cadf6ec59635 100644 --- a/pkgs/tools/misc/tere/default.nix +++ b/pkgs/tools/misc/tere/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage { cargoHash = "sha256-UWZWm6wDiQqUNcWV1nDUWXVhWgqoVUCDWz09cRkiPKg="; - nativeBuildInputs = [ + nativeCheckInputs = [ # ncurses provides the tput command needed for integration tests # https://github.com/mgunyho/tere/issues/93#issuecomment-2029624187 ncurses @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage { checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ # Unexplained fail # https://github.com/NixOS/nixpkgs/pull/298527#issuecomment-2053758845 - "--skip=first_run_prompt_accept" + "--skip=first_run_prompt" ]; # NOTE: workaround for build fail on aarch64 From de8e24a61e07a807b6cbb75d879f58e08215965c Mon Sep 17 00:00:00 2001 From: Francesco Carmelo Capria Date: Sun, 3 Nov 2024 09:45:50 +0100 Subject: [PATCH 37/56] hyprgui: 0.1.6 -> 0.1.7 --- pkgs/by-name/hy/hyprgui/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/hy/hyprgui/package.nix b/pkgs/by-name/hy/hyprgui/package.nix index 62a3c36d5565..539dcf36ab72 100644 --- a/pkgs/by-name/hy/hyprgui/package.nix +++ b/pkgs/by-name/hy/hyprgui/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "hyprgui"; - version = "0.1.6"; + version = "0.1.7"; src = fetchFromGitHub { owner = "hyprutils"; repo = "hyprgui"; rev = "refs/tags/v${version}"; - hash = "sha256-n/poyVDBnMb4vw2YEymxxdjscGmu76qQ/BbS5BJOknM="; + hash = "sha256-toHE+N18PGSp0HdR9tcVPYRdfNv20HQfS7U5fHeJ32s="; }; - cargoHash = "sha256-w+Bfjv7usyYfgTKW+KHqskNPco17QSjwn96cG/6yVoU="; + cargoHash = "sha256-Vn059HCHwz0j6ujDVk+GNrHQ7PhqBFb3XfjKLSYlYKg="; strictDeps = true; From a93d66c9d50b33959fac7e37b030f283efb32681 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sun, 29 Sep 2024 17:00:10 +0800 Subject: [PATCH 38/56] garble: move to by-name; nixfmt --- .../default.nix => by-name/ga/garble/package.nix} | 13 +++++++------ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 7 insertions(+), 8 deletions(-) rename pkgs/{development/tools/garble/default.nix => by-name/ga/garble/package.nix} (90%) diff --git a/pkgs/development/tools/garble/default.nix b/pkgs/by-name/ga/garble/package.nix similarity index 90% rename from pkgs/development/tools/garble/default.nix rename to pkgs/by-name/ga/garble/package.nix index 0735e283d6db..c469c0e01caf 100644 --- a/pkgs/development/tools/garble/default.nix +++ b/pkgs/by-name/ga/garble/package.nix @@ -1,8 +1,9 @@ -{ stdenv -, buildGoModule -, fetchFromGitHub -, lib -, git +{ + stdenv, + buildGoModule, + fetchFromGitHub, + lib, + git, }: buildGoModule rec { pname = "garble"; @@ -18,7 +19,7 @@ buildGoModule rec { vendorHash = "sha256-SOdIlu0QrQokl9j9Ff594+1K6twU1mCuECFQaVKaPV4="; # Used for some of the tests. - nativeCheckInputs = [git]; + nativeCheckInputs = [ git ]; preBuild = lib.optionalString (!stdenv.hostPlatform.isx86_64) '' # The test assumex amd64 assembly diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f17b22d3023..fcc1a43d9076 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19450,8 +19450,6 @@ with pkgs; ganv = callPackage ../development/libraries/ganv { }; - garble = callPackage ../development/tools/garble { }; - gcab = callPackage ../development/libraries/gcab { }; gcovr = with python3Packages; toPythonApplication gcovr; From a5b0e0634daab3bb60ae221e4793bb8c5f093af8 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sun, 29 Sep 2024 17:06:23 +0800 Subject: [PATCH 39/56] garble: add passthru.updateScript; 0.8.0 -> 0.13.0; add bot-wxt1221 as maintainers --- .../ga/garble/0001-Add-version-info.patch | 38 +++++++++++ pkgs/by-name/ga/garble/package.nix | 65 +++++++++++++++---- 2 files changed, 91 insertions(+), 12 deletions(-) create mode 100644 pkgs/by-name/ga/garble/0001-Add-version-info.patch diff --git a/pkgs/by-name/ga/garble/0001-Add-version-info.patch b/pkgs/by-name/ga/garble/0001-Add-version-info.patch new file mode 100644 index 000000000000..153ab8f4bf6d --- /dev/null +++ b/pkgs/by-name/ga/garble/0001-Add-version-info.patch @@ -0,0 +1,38 @@ +From e46a41faac008ede4acbeb18db5b3076eb206de5 Mon Sep 17 00:00:00 2001 +From: wxt <3264117476@qq.com> +Date: Sun, 3 Nov 2024 15:11:49 +0800 +Subject: [PATCH] Add version info + +--- + main.go | 1 + + testdata/script/help.txtar | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/main.go b/main.go +index 0de5a2f..1c830b1 100644 +--- a/main.go ++++ b/main.go +@@ -362,6 +362,7 @@ func mainErr(args []string) error { + // manually construct something like a pseudo-version. + // TODO: remove when this code is dead, hopefully in Go 1.22. + if mod.Version == "(devel)" { ++ mod.Version = "@version@" + var vcsTime time.Time + var vcsRevision string + for _, setting := range info.Settings { +diff --git a/testdata/script/help.txtar b/testdata/script/help.txtar +index 8f25260..859f492 100644 +--- a/testdata/script/help.txtar ++++ b/testdata/script/help.txtar +@@ -91,7 +91,7 @@ stderr 'directory not found' + # and to be able to use static VCS info, use an environment variable. + # First, test without the information, and then with it. + exec garble version +-stdout -count=1 'mvdan.cc/garble \(devel\)' ++stdout -count=1 'mvdan.cc/garble @version@' + stdout -count=1 'Build settings' + stdout -count=3 '-compiler|GOOS|GOARCH' + ! stdout 'vcs' +-- +2.46.1 + diff --git a/pkgs/by-name/ga/garble/package.nix b/pkgs/by-name/ga/garble/package.nix index c469c0e01caf..a9f2c711cb66 100644 --- a/pkgs/by-name/ga/garble/package.nix +++ b/pkgs/by-name/ga/garble/package.nix @@ -1,36 +1,77 @@ { + lib, stdenv, buildGoModule, fetchFromGitHub, - lib, + diffoscope, git, + versionCheckHook, + replaceVars, + nix-update-script, }: + buildGoModule rec { pname = "garble"; - version = "0.8.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "burrowers"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-f7coWG1CS4UL8GGqwADx5CvIk2sPONPlWW+JgRhFsb8="; + repo = "garble"; + rev = "refs/tags/v${version}"; + hash = "sha256-FtI5lAeqjRPN47iC46bcEsRLQb7mItw4svsnLkRpNxY="; }; - vendorHash = "sha256-SOdIlu0QrQokl9j9Ff594+1K6twU1mCuECFQaVKaPV4="; + __darwinAllowLocalNetworking = true; + + ldflags = [ + "-buildid=00000000000000000000" # length=20 + ]; + + patches = [ + (replaceVars ./0001-Add-version-info.patch { + inherit version; + }) + ]; + + checkFlags = [ + "-skip" + "TestScript/gogarble" + ]; + + vendorHash = "sha256-mSdajYiMEg2ik0ocfmHK+XddEss1qLu6rDwzjocaaW0="; # Used for some of the tests. - nativeCheckInputs = [ git ]; + nativeCheckInputs = [ + diffoscope + git + versionCheckHook + ]; - preBuild = lib.optionalString (!stdenv.hostPlatform.isx86_64) '' - # The test assumex amd64 assembly - rm testdata/script/asm.txtar + preCheck = '' + export HOME=$(mktemp -d) + export WORK=$(mktemp -d) ''; + # Several tests fail with + # FAIL: testdata/script/goenv.txtar:27: "$WORK/.temp 'quotes' and spaces" matches "garble|importcfg|cache\\.gob|\\.go" + doCheck = !stdenv.hostPlatform.isDarwin; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = [ "version" ]; + doInstallCheck = false; + + passthru.updateScript = nix-update-script { }; + meta = { description = "Obfuscate Go code by wrapping the Go toolchain"; homepage = "https://github.com/burrowers/garble/"; - maintainers = with lib.maintainers; [ davhau ]; + maintainers = with lib.maintainers; [ + davhau + bot-wxt1221 + ]; license = lib.licenses.bsd3; - broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/garble.x86_64-darwin + mainProgram = "garble"; }; } From 9fa7866c56578f3662f4c5e2444f702697f42bb5 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 3 Nov 2024 09:52:32 +0100 Subject: [PATCH 40/56] python312Packages.pynvim: 0.5.0 -> 0.5.1 Diff: https://github.com/neovim/pynvim/compare/refs/tags/0.5.0...0.5.1 Changelog: https://github.com/neovim/pynvim/releases/tag/0.5.1 --- .../python-modules/pynvim/default.nix | 26 ++++++++----------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/pynvim/default.nix b/pkgs/development/python-modules/pynvim/default.nix index c17df5386938..5a2ff7cd0cd9 100644 --- a/pkgs/development/python-modules/pynvim/default.nix +++ b/pkgs/development/python-modules/pynvim/default.nix @@ -4,44 +4,40 @@ fetchFromGitHub, setuptools, msgpack, + isPyPy, greenlet, pythonOlder, - isPyPy, + typing-extensions, }: buildPythonPackage rec { pname = "pynvim"; - version = "0.5.0"; + version = "0.5.1"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "neovim"; repo = "pynvim"; rev = "refs/tags/${version}"; - hash = "sha256-3LqgKENFzdfCjMlD6Xzv5W23yvIkNMUYo2+LlzKZ3cc="; + hash = "sha256-YVAWu+i2pElq8OhibSqh9ogk+xWDRCZT4niDF/oMnzY="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace " + pytest_runner" "" - ''; + build-system = [ setuptools ]; - buildInputs = [ setuptools ]; - - propagatedBuildInputs = [ msgpack ] ++ lib.optionals (!isPyPy) [ greenlet ]; + dependencies = + [ msgpack ] + ++ lib.optionals (!isPyPy) [ greenlet ] ++ lib.optionals (pythonOlder "3.12") [ typing-extensions ]; # Tests require pkgs.neovim which we cannot add because of circular dependency doCheck = false; pythonImportsCheck = [ "pynvim" ]; - meta = with lib; { + meta = { description = "Python client for Neovim"; homepage = "https://github.com/neovim/pynvim"; changelog = "https://github.com/neovim/pynvim/releases/tag/${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ figsoda ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ figsoda ]; }; } From 63c7cab6d30ccb7cd1298ea66a1e1db6a42cbcfb Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Wed, 30 Oct 2024 20:02:35 +0800 Subject: [PATCH 41/56] less: Fix withSecure regression --- pkgs/by-name/le/less/package.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/by-name/le/less/package.nix b/pkgs/by-name/le/less/package.nix index ba57f5460ccd..452944aa9a75 100644 --- a/pkgs/by-name/le/less/package.nix +++ b/pkgs/by-name/le/less/package.nix @@ -1,6 +1,8 @@ { lib, fetchurl, + fetchpatch, + autoreconfHook, ncurses, pcre2, stdenv, @@ -22,6 +24,23 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-KBn1VWTYbVQqu+yv2C/2HoGaPuyWf6o2zT5o8VlqRLg="; }; + patches = [ + (fetchpatch { + # Fix configure parameters --with-secure=no and --without-secure. + url = "https://github.com/gwsw/less/commit/8fff6c56bfc833528b31ebdaee871f65fbe342b1.patch"; + hash = "sha256-XV5XufivNWWLGeIpaP04YQPWcxIUKYYEINdT+eEx+WA="; + includes = [ + "configure.ac" + ]; + }) + ]; + + # Need `autoreconfHook` since we patch `configure.ac`. + # TODO: Remove the `configure.ac` patch and `autoreconfHook` next release + nativeBuildInputs = [ + autoreconfHook + ]; + buildInputs = [ ncurses pcre2 From 834c2ad5c201a54d70c40210ac22073b86b90f99 Mon Sep 17 00:00:00 2001 From: Felix Stupp Date: Sun, 3 Nov 2024 14:43:49 +0100 Subject: [PATCH 42/56] immich: comment reasoning for jellyfin-ffmpeg Using the jellyfin-ffmpeg variant has a reason (TL;DR: used by upstream), which is now mentioned & linked to in the nix file itself, see https://github.com/NixOS/nixpkgs/issues/351943. Extends https://github.com/NixOS/nixpkgs/pull/351975. --- pkgs/by-name/im/immich/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/im/immich/package.nix b/pkgs/by-name/im/immich/package.nix index 66213718fd23..a018bee46c88 100644 --- a/pkgs/by-name/im/immich/package.nix +++ b/pkgs/by-name/im/immich/package.nix @@ -17,7 +17,7 @@ cacert, unzip, # runtime deps - jellyfin-ffmpeg, + jellyfin-ffmpeg, # Immich depends on the jellyfin customizations, see https://github.com/NixOS/nixpkgs/issues/351943 imagemagick, libraw, libheif, From 688e0e14c4cbb2574561aa156d16a1f2fc9c35ad Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Sun, 3 Nov 2024 13:57:17 +0000 Subject: [PATCH 43/56] woodpecker-server: 2.7.1 -> 2.7.2 https://github.com/woodpecker-ci/woodpecker/releases/tag/v2.7.2 --- .../tools/continuous-integration/woodpecker/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/woodpecker/common.nix b/pkgs/development/tools/continuous-integration/woodpecker/common.nix index 15b74b0a43e0..03bd50489b69 100644 --- a/pkgs/development/tools/continuous-integration/woodpecker/common.nix +++ b/pkgs/development/tools/continuous-integration/woodpecker/common.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "2.7.1"; - srcHash = "sha256-x9eCBxrujIJ0kwN5jyn7FKu7uyN+pIBCVDLckhiUzmM="; + version = "2.7.2"; + srcHash = "sha256-p4PH/rRcswrKVO1uEykCa0wgrJvawp58oD6/kLRxoS4="; # The tarball contains vendored dependencies vendorHash = null; in From d080f9fc66814a4169d569a65975cdb712b96f4b Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 3 Nov 2024 13:02:42 +0100 Subject: [PATCH 44/56] postgrest: add myself as maintainer --- .../haskell-modules/configuration-hackage2nix/main.yaml | 2 ++ pkgs/development/haskell-modules/hackage-packages.nix | 1 + 2 files changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 960d784c07df..ed1883ad422a 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -652,6 +652,8 @@ package-maintainers: - minio-hs - smtp-mail - pdftotext + wolfgangwalther: + - postgrest unsupported-platforms: Allure: [ platforms.darwin ] diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 540563af0030..1652e68939dc 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -245987,6 +245987,7 @@ self: { description = "REST API for any Postgres database"; license = lib.licenses.mit; mainProgram = "postgrest"; + maintainers = [ lib.maintainers.wolfgangwalther ]; }) {}; "postgrest-ws" = callPackage From 47a22a4271aa511f65fede042f03343df1f8df11 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 3 Nov 2024 13:26:48 +0100 Subject: [PATCH 45/56] postgrest: remove mentioned issue for jailbreaking This has been closed and merged since v11 already - but the bounds are still too strict. The only way forward is to figure out how to upgrade to the latest version. --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 8078db8925de..2e7cce75adea 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2839,7 +2839,7 @@ self: super: { postgrest = lib.pipe super.postgrest [ # 2023-12-20: New version needs extra dependencies (addBuildDepends [ self.extra self.fuzzyset_0_2_4 self.cache self.timeit ]) - # 2022-12-02: Too strict bounds: https://github.com/PostgREST/postgrest/issues/2580 + # 2022-12-02: Too strict bounds. doJailbreak # 2022-12-02: Hackage release lags behind actual releases: https://github.com/PostgREST/postgrest/issues/2275 (overrideSrc rec { From 2679bd2fd6f339f2d6a4b1fbe7e91c3756c85549 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 3 Nov 2024 13:16:06 +0100 Subject: [PATCH 46/56] postgrest: 12.0.2 -> 12.0.3 Changelog: https://github.com/PostgREST/postgrest/releases/tag/v12.0.3 Can't update to 12.2.x, yet, without figuring out some dependency issues. --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 2e7cce75adea..b2429491482a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2843,12 +2843,12 @@ self: super: { doJailbreak # 2022-12-02: Hackage release lags behind actual releases: https://github.com/PostgREST/postgrest/issues/2275 (overrideSrc rec { - version = "12.0.2"; + version = "12.0.3"; src = pkgs.fetchFromGitHub { owner = "PostgREST"; repo = "postgrest"; rev = "v${version}"; - hash = "sha256-fpGeL8R6hziEtIgHUMfWLF7JAjo3FDYQw3xPSeQH+to="; + hash = "sha256-peXM5/K034Phcy5vNhc5AT3/9oGXohVogFN9gRsSosY="; }; }) ]; From c47859a9686fc93236699b3bce05814c787fb3be Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 3 Nov 2024 12:59:56 +0100 Subject: [PATCH 47/56] postgrest: fix build on aarch64-darwin Dependency on the Paths_ module has been removed upstream for the next (unreleased) version already. Until we can update, apply the patch manually. Resolves #347885 --- .../haskell-modules/configuration-common.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b2429491482a..030b8a4d4379 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2851,6 +2851,20 @@ self: super: { hash = "sha256-peXM5/K034Phcy5vNhc5AT3/9oGXohVogFN9gRsSosY="; }; }) + # 2024-11-03: Needed for the patch below. Can be dropped after updating to 12.2+. + (appendPatches [ + (fetchpatch { + url = "https://github.com/PostgREST/postgrest/commit/d311fb17c46ad2ab9064c7aba1954d3500ef0e54.patch"; + hash = "sha256-O/bBm93V6GIPSB5dwhNUFgX3vXA01LPJapZQoeJmbIU="; + }) + ]) + # 2024-11-03: Fixes build on aarch64-darwin. Can be removed after updating to 13+. + (appendPatches [ + (fetchpatch { + url = "https://github.com/PostgREST/postgrest/commit/c045b261c4f7d2c2514e858120950be6b3ddfba8.patch"; + hash = "sha256-6SeteL5sb+/K1y3f9XL7yNzXDdD1KQp91RNP4kutSLE="; + }) + ]) ]; # Too strict bounds on hspec < 2.11 From ec8d97fb5051257d1bf3cda4a306049374d62149 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sun, 3 Nov 2024 19:11:53 +0100 Subject: [PATCH 48/56] vscode-extensions.visualjj.visualjj: 0.12.2 -> 0.12.3 --- .../vscode/extensions/visualjj.visualjj/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix index 527e26c2d9c3..02e8a74f4107 100644 --- a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix +++ b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix @@ -6,28 +6,28 @@ }: let - version = "0.12.2"; + version = "0.12.3"; sources = { "x86_64-linux" = { arch = "linux-x64"; url = "https://download.visualjj.com/visualjj-linux-x64-${version}.vsix"; - hash = "sha256-42xUp1HDnu1YZwXYgBhqshNzA0sx7VZLZzSaQypZb1M="; + hash = "sha256-dpvdWE0LL4PY2bzfRLazqP+VB9SSyhwnMLoOLsMmNJw="; }; "x86_64-darwin" = { arch = "darwin-x64"; url = "https://download.visualjj.com/visualjj-darwin-x64-${version}.vsix"; - hash = "sha256-RFxhGKQpQnMbwuYfHQolFRJxI61hzog2A44x7W39yKw="; + hash = "sha256-81ahZTuIG5ukXm+gmVzg4RgryRTyOIBaQ6BvGLCXVp0="; }; "aarch64-linux" = { arch = "linux-arm64"; url = "https://download.visualjj.com/visualjj-linux-arm64-${version}.vsix"; - hash = "sha256-KHeg2wAe1aynwAbQh5Do/rCbk2bqLZ3iIrYpDFRIw/E="; + hash = "sha256-brheyxw4tHXF5Guzn8fzolQmcLQvOknPeAtGNPowcBk="; }; "aarch64-darwin" = { arch = "darwin-arm64"; url = "https://download.visualjj.com/visualjj-darwin-arm64-${version}.vsix"; - hash = "sha256-3y/MhxDgQBnbQ2OYLYFcl7488sKE7iVO4YhUhmQyCIM="; + hash = "sha256-EgupFXNfKKkk3FgEmgYwsY/QdaTLlbghKIIHQcvLatY="; }; }; in From 2223312e3d895c6350351665e0bf83f001f06613 Mon Sep 17 00:00:00 2001 From: Jack Wilsdon Date: Sun, 3 Nov 2024 18:26:20 +0000 Subject: [PATCH 49/56] nixos/networkd: allow byte values to be integers --- nixos/lib/systemd-lib.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/lib/systemd-lib.nix b/nixos/lib/systemd-lib.nix index ede54318d558..39961f0f25d5 100644 --- a/nixos/lib/systemd-lib.nix +++ b/nixos/lib/systemd-lib.nix @@ -99,8 +99,9 @@ in rec { l = reverseList (stringToCharacters s); suffix = head l; nums = tail l; - in elem suffix (["K" "M" "G" "T"] ++ digits) - && all (num: elem num digits) nums; + in builtins.isInt s + || (elem suffix (["K" "M" "G" "T"] ++ digits) + && all (num: elem num digits) nums); assertByteFormat = name: group: attr: optional (attr ? ${name} && ! isByteFormat attr.${name}) From 723522cc4aab430c64d9125ce44c71470a6376fa Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 3 Nov 2024 15:37:54 -0300 Subject: [PATCH 50/56] labwc: remove AndersonTorres --- pkgs/by-name/la/labwc/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/la/labwc/package.nix b/pkgs/by-name/la/labwc/package.nix index 594a255bb989..49af5cf95847 100644 --- a/pkgs/by-name/la/labwc/package.nix +++ b/pkgs/by-name/la/labwc/package.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Wayland stacking compositor, inspired by Openbox"; license = with lib.licenses; [ gpl2Plus ]; mainProgram = "labwc"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; inherit (wayland.meta) platforms; }; }) From 4083af87bbb8f48b88bad0539a6a5f2914f2a786 Mon Sep 17 00:00:00 2001 From: Terry Garcia Date: Sun, 3 Nov 2024 12:47:39 -0600 Subject: [PATCH 51/56] simplex-chat-desktop: 6.1.0 -> 6.1.1 --- pkgs/by-name/si/simplex-chat-desktop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/simplex-chat-desktop/package.nix b/pkgs/by-name/si/simplex-chat-desktop/package.nix index 4c9c443ee8d6..5fe138d19420 100644 --- a/pkgs/by-name/si/simplex-chat-desktop/package.nix +++ b/pkgs/by-name/si/simplex-chat-desktop/package.nix @@ -6,11 +6,11 @@ let pname = "simplex-chat-desktop"; - version = "6.1.0"; + version = "6.1.1"; src = fetchurl { url = "https://github.com/simplex-chat/simplex-chat/releases/download/v${version}/simplex-desktop-x86_64.AppImage"; - hash = "sha256-Fe84rggb539MJXkbJqQRemToTLyX61BbXtoDRUuds8k="; + hash = "sha256-FHkZqbbJTQz+gIOgpMiak9u4ZOY/7r+1+if74LHLw/c="; }; appimageContents = appimageTools.extract { From 733c8cddba2788bb6a2de9fd897bd66f9bae454d Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 3 Nov 2024 19:44:52 +0000 Subject: [PATCH 52/56] php{81,82,83,84}Extensions.snmp: remove Darwin conditional This was accidentally inverted, but also it builds fine on Darwin now. --- pkgs/top-level/php-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 0307e5185a1d..6f4a454b8d14 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -650,8 +650,6 @@ in { name = "snmp"; buildInputs = [ net-snmp openssl ]; configureFlags = [ "--with-snmp" ]; - # net-snmp doesn't build on darwin. - meta.broken = (!stdenv.hostPlatform.isDarwin); doCheck = false; } { From 64a34a49aab91a65a1fc7317463e0fcb40ea501b Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Mon, 4 Nov 2024 02:20:56 +0530 Subject: [PATCH 53/56] pyprland: 2.4.0 -> 2.4.1 --- pkgs/by-name/py/pyprland/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/py/pyprland/package.nix b/pkgs/by-name/py/pyprland/package.nix index 4ae7590aec37..258c35361986 100644 --- a/pkgs/by-name/py/pyprland/package.nix +++ b/pkgs/by-name/py/pyprland/package.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { pname = "pyprland"; - version = "2.4.0"; + version = "2.4.1"; format = "pyproject"; disabled = python3Packages.pythonOlder "3.10"; @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { owner = "hyprland-community"; repo = "pyprland"; rev = "refs/tags/${version}"; - hash = "sha256-jK6ap/beiqAtZXVNqPB3zV8R2Kfc3LhqJBvFlWYIfb4="; + hash = "sha256-QONnIElYz8UjyLICSm2QGZME5jx+l2Zw4r7kwHW8YEM="; }; nativeBuildInputs = with python3Packages; [ poetry-core ]; From c751cf7ce50be5e42ac9af33b92a28db34c2b24a Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Mon, 4 Nov 2024 02:21:41 +0530 Subject: [PATCH 54/56] pyprland: relax deps to fix build --- pkgs/by-name/py/pyprland/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/py/pyprland/package.nix b/pkgs/by-name/py/pyprland/package.nix index 258c35361986..e5da7fbc37ef 100644 --- a/pkgs/by-name/py/pyprland/package.nix +++ b/pkgs/by-name/py/pyprland/package.nix @@ -22,6 +22,9 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = with python3Packages; [ poetry-core ]; propagatedBuildInputs = with python3Packages; [ aiofiles ]; + pythonRelaxDeps = [ + "aiofiles" + ]; postInstall = '' # file has shebang but cant be run due to a relative import, has proper entrypoint in /bin From 4331127c64515daa35e1d9a78e96ab48a1eb26b9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 3 Nov 2024 20:55:58 +0000 Subject: [PATCH 55/56] vscode-extensions.mongodb.mongodb-vscode: 1.9.1 -> 1.9.3 --- .../vscode/extensions/mongodb.mongodb-vscode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix index 56fffc0080cd..d53540ba0cf6 100644 --- a/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix @@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "mongodb-vscode"; publisher = "mongodb"; - version = "1.9.1"; - hash = "sha256-XWWBk/QW37Dg0RJJwJ65w1r9WGC6iAGCgigsnGm/ilc="; + version = "1.9.3"; + hash = "sha256-3+KIO2d/0egvc4awStYgPvpWa9fmYH0V7QHUavzFn8A="; }; meta = { From b6b1e9774eb456e645418e204410ffad865a0cfc Mon Sep 17 00:00:00 2001 From: SandaruKasa Date: Mon, 4 Nov 2024 01:32:39 +0300 Subject: [PATCH 56/56] pest-ide-tools: remove openssl dependency & MIT license (#320064) * pest-ide-tools: remove openssl dependency openssl was dropped in favor of rustls in 0.3.9 https://github.com/pest-parser/pest-ide-tools/commit/7d6d1ef59a386e30d5e7bb7ced4d7bd1c75101b7 * pest-ide-tools: remove erroneous MIT license Despite the common practise among rustaceans to use a dual Apache-2.0/MIT license, `pest-ide-tools` has only ever been licensed under Apache-2.0 https://github.com/pest-parser/pest-ide-tools/commits/v0.3.11/LICENSE --- pkgs/development/tools/misc/pest-ide-tools/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/misc/pest-ide-tools/default.nix b/pkgs/development/tools/misc/pest-ide-tools/default.nix index d71155bd6711..4e0fdaebdb33 100644 --- a/pkgs/development/tools/misc/pest-ide-tools/default.nix +++ b/pkgs/development/tools/misc/pest-ide-tools/default.nix @@ -3,8 +3,6 @@ , fetchFromGitHub , rustPlatform , nix-update-script -, pkg-config -, openssl , darwin }: @@ -19,10 +17,7 @@ rustPlatform.buildRustPackage rec { rev = "v${version}"; sha256 = "sha256-12/FndzUbUlgcYcwMT1OfamSKgy2q+CvtGyx5YY4IFQ="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - openssl - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; @@ -33,7 +28,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "IDE support for Pest, via the LSP"; homepage = "https://pest.rs"; - license = with licenses; [ mit asl20 ]; + license = with licenses; [ asl20 ]; maintainers = with maintainers; [ nickhu ]; mainProgram = "pest-language-server"; };