From ed7c0c6e7579db97c8889f5bd2bdd8a66f60aab9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 21 Sep 2023 22:19:21 +0200 Subject: [PATCH 01/33] nixos/wireguard: add metric option This new option, networking.wireguard.interfaces.NAME.metric, allows increasing the metric of the routes, effectively lowering priority. (I'm using high metric to allow having the Wireguard interface always up, even when the client machines are on their home network. Before I had to stop the interface when home to avoid packet routing issues.) --- nixos/modules/services/networking/wireguard.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix index 21473388d76e..d4099be12a27 100644 --- a/nixos/modules/services/networking/wireguard.nix +++ b/nixos/modules/services/networking/wireguard.nix @@ -164,6 +164,15 @@ let of the wireguard network has to be adjusted as well. ''; }; + + metric = mkOption { + default = null; + type = with types; nullOr int; + example = 700; + description = lib.mdDoc '' + Set the metric of routes related to this Wireguard interface. + ''; + }; }; }; @@ -395,7 +404,7 @@ let optionalString interfaceCfg.allowedIPsAsRoutes (concatMapStringsSep "\n" (allowedIP: - ''${ip} route replace "${allowedIP}" dev "${interfaceName}" table "${interfaceCfg.table}"'' + ''${ip} route replace "${allowedIP}" dev "${interfaceName}" table "${interfaceCfg.table}" ${optionalString (interfaceCfg.metric != null) "metric ${toString interfaceCfg.metric}"}'' ) peer.allowedIPs); in '' ${wg_setup} From e9dbf65372e9a5f57fbad9c5e161d993da389aae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Sep 2023 10:46:54 +0000 Subject: [PATCH 02/33] appflowy: 0.3.1 -> 0.3.2 --- pkgs/applications/office/appflowy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/appflowy/default.nix b/pkgs/applications/office/appflowy/default.nix index 11d291238727..e99c0fedf961 100644 --- a/pkgs/applications/office/appflowy/default.nix +++ b/pkgs/applications/office/appflowy/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "appflowy"; - version = "0.3.1"; + version = "0.3.2"; src = fetchzip { url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy_x86_64-unknown-linux-gnu_ubuntu-20.04.tar.gz"; - hash = "sha256-jIekGA+MG9tvjEyHAI3dcD7lI1JL/qPqRpVO9gRhcTw="; + hash = "sha256-UmBXAfRIr9zOScqibKPHeKzr+UTx3gbGEm0tl7qn+oE="; stripRoot = false; }; From cf423daab0632fddae83954e74b28b8f89fac3ac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Sep 2023 11:56:33 +0000 Subject: [PATCH 03/33] beluga: 1.1 -> 1.1.1 --- pkgs/applications/science/logic/beluga/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/beluga/default.nix b/pkgs/applications/science/logic/beluga/default.nix index 3cb06c4e7b14..693be7f33886 100644 --- a/pkgs/applications/science/logic/beluga/default.nix +++ b/pkgs/applications/science/logic/beluga/default.nix @@ -2,13 +2,13 @@ ocamlPackages.buildDunePackage rec { pname = "beluga"; - version = "1.1"; + version = "1.1.1"; src = fetchFromGitHub { owner = "Beluga-lang"; repo = "Beluga"; rev = "refs/tags/v${version}"; - hash = "sha256-0E7rmiLmQPfOAQ1qKiqxeLdqviVl+Thkl6KfOWkGZRc="; + hash = "sha256-l/C77czLtlLnpadVx4d9ve9jv/e11jsOgzrbXt+Zo5s="; }; duneVersion = "3"; From 56a9f90105bd4c448888a87f12be199ab6ebe9a4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 Sep 2023 10:09:07 +0000 Subject: [PATCH 04/33] libite: 2.5.3 -> 2.6.0 --- pkgs/development/libraries/libite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libite/default.nix b/pkgs/development/libraries/libite/default.nix index 900146f6b011..c75c83764ac3 100644 --- a/pkgs/development/libraries/libite/default.nix +++ b/pkgs/development/libraries/libite/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libite"; - version = "2.5.3"; + version = "2.6.0"; src = fetchFromGitHub { owner = "troglobit"; repo = "libite"; rev = "v${version}"; - sha256 = "sha256-orxmd6yItB6XLj650RQb0CP/EnN9563v+P9xz9LEJkY="; + sha256 = "sha256-hdV8g/BFTI/QfEgVsf942SR0G5xdqP/+h+vnydt4kf0="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From 69c1daba76f1c567eaf5da9e0f7259e3f743a673 Mon Sep 17 00:00:00 2001 From: 3JlOy_PYCCKUI <3jl0y_pycckui@riseup.net> Date: Sat, 23 Sep 2023 17:30:48 +0300 Subject: [PATCH 05/33] anilibria-winmaclinux: 1.2.9 -> 1.2.10 --- pkgs/applications/video/anilibria-winmaclinux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/anilibria-winmaclinux/default.nix b/pkgs/applications/video/anilibria-winmaclinux/default.nix index 823dbfef97a9..f1c2b13d73a2 100644 --- a/pkgs/applications/video/anilibria-winmaclinux/default.nix +++ b/pkgs/applications/video/anilibria-winmaclinux/default.nix @@ -14,13 +14,13 @@ mkDerivation rec { pname = "anilibria-winmaclinux"; - version = "1.2.9"; + version = "1.2.10"; src = fetchFromGitHub { owner = "anilibria"; repo = "anilibria-winmaclinux"; rev = version; - sha256 = "sha256-Fdj7i4jpKIDwaIBAch7SjIV/WnqMDnCfNYSiZLsamx8="; + sha256 = "sha256-mCDw8V/Uzewm32rj+mkkm5atS5nJAFJ3ry1boTn+gqI="; }; sourceRoot = "source/src"; From 185f5e4254e5aca6d09c455a185a36161316aacf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Sat, 23 Sep 2023 18:20:08 +0200 Subject: [PATCH 06/33] ldtk: 1.3.4 -> 1.4.0 --- pkgs/applications/editors/ldtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/ldtk/default.nix b/pkgs/applications/editors/ldtk/default.nix index 4d8dc4d58dc5..f82ee11c3f88 100644 --- a/pkgs/applications/editors/ldtk/default.nix +++ b/pkgs/applications/editors/ldtk/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "ldtk"; - version = "1.3.4"; + version = "1.4.0"; src = fetchurl { url = "https://github.com/deepnight/ldtk/releases/download/v${finalAttrs.version}/ubuntu-distribution.zip"; - hash = "sha256-/EFmuzj8hYhQJegZpZhZb4fuSeMF9wdG1Be4duEvW54="; + hash = "sha256-WuKzhE9r/yMqlV2bf/0AuNVKfxq/SlecmN3rHt6RjXo="; }; nativeBuildInputs = [ unzip makeWrapper copyDesktopItems appimage-run ]; From 7027aace9fd4ae285e469f8dd15471ab993e7754 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corn=C3=A9=20Dorrestijn?= Date: Sat, 23 Sep 2023 20:53:17 +0200 Subject: [PATCH 07/33] bun: 1.0.2 -> 1.0.3 --- pkgs/development/web/bun/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix index 8b88adeed422..4749f4a1dd69 100644 --- a/pkgs/development/web/bun/default.nix +++ b/pkgs/development/web/bun/default.nix @@ -12,7 +12,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "1.0.2"; + version = "1.0.3"; pname = "bun"; src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); @@ -51,19 +51,19 @@ stdenvNoCC.mkDerivation rec { sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - hash = "sha256-QvoEakfR5wmP10d6MDpfS8THke975bVyZc5pLVliUbQ="; + hash = "sha256-M0OG9V+TVqUqNuEDvpPCJR1KvILty7M59JiYjOsRjS0="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - hash = "sha256-izVtW28QE7Tty6DfQDKmw1oqD5GOolTzCeIUmtgI1Uw="; + hash = "sha256-xpV818IKE55ZdiLqgXupbFFNnnsRtBaIXUWJVfSeEnA="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip"; - hash = "sha256-e/VXNCq2CwNsM7ruk8IGSwU/swkVhcvvQRv/yiIQtCU="; + hash = "sha256-60rJzbuHxDqnfCjmO3givs4/xpOWOG8B7bTWR52xML4="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - hash = "sha256-kHv8PU48Le4lG3pf304hXggAtx/I5uBeu4aHmLsbdgw="; + hash = "sha256-c+/yHKIZAPmpwCRn7HLC39tj0nGeAK1qlby4UuILZRw="; }; }; updateScript = writeShellScript "update-bun" '' From b91d9a2f0bf7ec620ec1889c57ef06c27f757c0a Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 23 Sep 2023 21:15:02 +0200 Subject: [PATCH 08/33] jetty: 11.0.15 -> 11.0.16 Includes fixes for CVE-2023-40167, CVE-2023-36479, CVE-2023-41900 and GHSA-58qw-p7qm-5rvh. Changelog: https://github.com/eclipse/jetty.project/releases/tag/jetty-11.0.16 --- pkgs/servers/http/jetty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix index 0aa226e46658..efcce583ce92 100644 --- a/pkgs/servers/http/jetty/default.nix +++ b/pkgs/servers/http/jetty/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "jetty"; - version = "11.0.15"; + version = "11.0.16"; src = fetchurl { url = "mirror://maven/org/eclipse/jetty/jetty-home/${version}/jetty-home-${version}.tar.gz"; - sha256 = "sha256-bDg3CYPAGryqRv/gcPdeZKucXx6YTkkNd0Cu1+zIjto="; + hash = "sha256-iL1s4o/1Hds0N/fzXgwOMriPtZNG7ei2t4frF1ImW+E="; }; dontBuild = true; From 7ed92e9d6c07c91bb7ac70056aee2139acb605b0 Mon Sep 17 00:00:00 2001 From: Icy-Thought Date: Sun, 24 Sep 2023 04:18:36 +0200 Subject: [PATCH 09/33] upscayl: 2.8.1 -> 2.8.6 --- pkgs/applications/graphics/upscayl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/upscayl/default.nix b/pkgs/applications/graphics/upscayl/default.nix index d146919e556f..ec37b9b429f0 100644 --- a/pkgs/applications/graphics/upscayl/default.nix +++ b/pkgs/applications/graphics/upscayl/default.nix @@ -4,11 +4,11 @@ lib, }: let pname = "upscayl"; - version = "2.8.1"; + version = "2.8.6"; src = fetchurl { url = "https://github.com/upscayl/upscayl/releases/download/v${version}/upscayl-${version}-linux.AppImage"; - hash = "sha256-gmFT6onuoaw9WDCUDImZM/AxuZECqPC73ZyNnp6WSGA="; + hash = "sha256-w5rjLqdlPOZWgdc2t0Y3tl24qZqpjBV6I9gruLaI+qc="; }; appimageContents = appimageTools.extractType2 { From 00e129441455e51ce21266b99119b08a551d012e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 24 Sep 2023 03:50:23 +0000 Subject: [PATCH 10/33] urbit: 2.11 -> 2.12 --- pkgs/misc/urbit/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/misc/urbit/default.nix b/pkgs/misc/urbit/default.nix index 81dd6b81badc..3a9488a5951a 100644 --- a/pkgs/misc/urbit/default.nix +++ b/pkgs/misc/urbit/default.nix @@ -10,15 +10,15 @@ let in stdenv.mkDerivation rec { pname = "urbit"; - version = "2.11"; + version = "2.12"; src = fetchzip { url = "https://github.com/urbit/vere/releases/download/vere-v${version}/${platform}.tgz"; sha256 = { - x86_64-linux = "sha256-k2zmcjZ9NXmwZf93LIAg1jx4IRprKUgdkvwzxEOKWDY="; - aarch64-linux = "sha256-atMBXyXwavpSDTZxUnXIq+NV4moKGRWLaFTM9Kuzt94="; - x86_64-darwin = "sha256-LSJ9jVY3fETlpRAkyUWa/2vZ5xAFmmMssvbzUfIBY/4="; - aarch64-darwin = "sha256-AViUt2N+YCgMWOcv3ZI0GfdYVOiRLbhseQ7TTq4zCiQ="; + x86_64-linux = "sha256-N8RYlafw0HcmtGAQMKQb1cG7AivOpWS/5rU8CESJWAw="; + aarch64-linux = "sha256-RsBtwxSdqHVXMk7or1nPAFWd6Ypa0SqjpTihv8riyk4="; + x86_64-darwin = "sha256-/QPI66/gl3mlQHc+8zrEyP4/Hv5vwXlEx1cW2mP33IY="; + aarch64-darwin = "sha256-+2DYohaBxVcR1ZOjuk6GWcNpzb6aJMXq6BxwWw1OeIY="; }.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); }; From f0ae65ded87345b350a9e81831caa8b6504e0970 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Sun, 24 Sep 2023 08:51:30 +0200 Subject: [PATCH 11/33] jellyfin: 10.8.10 -> 10.8.11 --- pkgs/servers/jellyfin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jellyfin/default.nix b/pkgs/servers/jellyfin/default.nix index 9ac59bf72cf7..9d846ba8a8df 100644 --- a/pkgs/servers/jellyfin/default.nix +++ b/pkgs/servers/jellyfin/default.nix @@ -14,13 +14,13 @@ buildDotnetModule rec { pname = "jellyfin"; - version = "10.8.10"; # ensure that jellyfin-web has matching version + version = "10.8.11"; # ensure that jellyfin-web has matching version src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin"; rev = "v${version}"; - sha256 = "uX56TSyi0V0Rs6R3A8QHZrjTIHUZobLYIgG+nZDE3Hg="; + sha256 = "deJv2lWo0kXGixCBJzfdIBZcNjg45y2ITGQfWcM2smU="; }; patches = [ From 042b55200a43e2e7b206a78f4864a9a740359103 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Sun, 24 Sep 2023 08:51:46 +0200 Subject: [PATCH 12/33] jellyfin-web: 10.8.10 -> 10.8.11 --- pkgs/servers/jellyfin/web.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/jellyfin/web.nix b/pkgs/servers/jellyfin/web.nix index f982cc5dd04c..6f9d278091bb 100644 --- a/pkgs/servers/jellyfin/web.nix +++ b/pkgs/servers/jellyfin/web.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "jellyfin-web"; - version = "10.8.10"; + version = "10.8.11"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-web"; rev = "v${version}"; - hash = "sha256-fJmGiHLwhgd3Ac7ggCbkMu6llob3qN87EpHpCO4K29I="; + hash = "sha256-Gl8eaC/AXBD956tAepwWVG3lSvL4rBCcgmkHeT/mrzM="; }; - npmDepsHash = "sha256-X8a/pmQGAhoGKhThJ86b50sf0nlsCXGgvLQaxRsmA5Q="; + npmDepsHash = "sha256-HoRteA6KFCFxDdwGtDKrvwWCMYNfYQWlit52RAN1eAU="; npmBuildScript = [ "build:production" ]; From 33acbf67f8479bc35dc10f6e75ecf522e826c3a9 Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Sun, 24 Sep 2023 09:50:01 +0200 Subject: [PATCH 13/33] routinator: 0.12.2 -> 0.13.0 --- pkgs/servers/routinator/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/routinator/default.nix b/pkgs/servers/routinator/default.nix index a56a5e491a03..3ab45831389b 100644 --- a/pkgs/servers/routinator/default.nix +++ b/pkgs/servers/routinator/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "routinator"; - version = "0.12.2"; + version = "0.13.0"; src = fetchFromGitHub { owner = "NLnetLabs"; repo = pname; rev = "v${version}"; - hash = "sha256-fblUr2gtlGMRAFbpWYDafskLmIls56e9b2GFD7ASZHM="; + hash = "sha256-gInJS7JpvEbmOuZecB4xjff2d7TnjcVV+8mPOmy5Oyo="; }; - cargoHash = "sha256-pvb/tZW4jqNSLgp+Ktakd3J1KVfCRtPgE0bgNst6ImQ="; + cargoHash = "sha256-c5SQysjO821pfGhnyB4aGOZuwrHaN502PfkA1gBPtY4="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; From c5ba4c687ebef2c7286416814ff80552cc0177c4 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Mon, 18 Sep 2023 13:54:21 +0800 Subject: [PATCH 14/33] nixos/kanata: add default value, doc and warning for devices --- nixos/modules/services/hardware/kanata.nix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/hardware/kanata.nix b/nixos/modules/services/hardware/kanata.nix index 7d544050130b..aac20c6c760e 100644 --- a/nixos/modules/services/hardware/kanata.nix +++ b/nixos/modules/services/hardware/kanata.nix @@ -9,8 +9,14 @@ let options = { devices = mkOption { type = types.listOf types.str; + default = [ ]; example = [ "/dev/input/by-id/usb-0000_0000-event-kbd" ]; - description = mdDoc "Paths to keyboard devices."; + description = mdDoc '' + Paths to keyboard devices. + + An empty list, the default value, lets kanata detect which + input devices are keyboards and intercept them all. + ''; }; config = mkOption { type = types.lines; @@ -162,6 +168,14 @@ in }; config = mkIf cfg.enable { + warnings = + let + keyboardsWithEmptyDevices = filterAttrs (name: keyboard: keyboard.devices == [ ]) cfg.keyboards; + existEmptyDevices = length (attrNames keyboardsWithEmptyDevices) > 0; + moreThanOneKeyboard = length (attrNames cfg.keyboards) > 1; + in + optional (existEmptyDevices && moreThanOneKeyboard) "One device can only be intercepted by one kanata instance. Setting services.kanata.keyboards.${head (attrNames keyboardsWithEmptyDevices)}.devices = [ ] and using more than one services.kanata.keyboards may cause a race condition."; + hardware.uinput.enable = true; systemd.services = mapAttrs' mkService cfg.keyboards; From 37ff97c18ff5417203a1ad2aa839d8c77d7c41e5 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 24 Sep 2023 10:41:11 -0400 Subject: [PATCH 15/33] oha: 0.6.3 -> 0.6.4 Diff: https://github.com/hatoo/oha/compare/refs/tags/v0.6.3...v0.6.4 Changelog: https://github.com/hatoo/oha/blob/v0.6.4/CHANGELOG.md --- pkgs/tools/networking/oha/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/oha/default.nix b/pkgs/tools/networking/oha/default.nix index 24e70cb073d1..327161c8a973 100644 --- a/pkgs/tools/networking/oha/default.nix +++ b/pkgs/tools/networking/oha/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "oha"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "hatoo"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-vna0wmdcugrYLubnjSgBBeDW6ZHH3VToIJG0z8sB/ss="; + sha256 = "sha256-zupenhIxw93EifV1JRcM9ryGli+wqo88JH+8JciOn8E="; }; - cargoSha256 = "sha256-d6gK/+dsJYb/9HSOHOsly3b35dh0FZ+aNnDVVzcXiV0="; + cargoSha256 = "sha256-g0YJu34LmqqKCSVqS6LaO71iCJ26QKvbMpR6+sMLTr4="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config From af565af2c72d52d9a670ad47858377f0093c868f Mon Sep 17 00:00:00 2001 From: oluceps Date: Sun, 24 Sep 2023 22:48:03 +0800 Subject: [PATCH 16/33] clash-meta: 1.15.1 -> 1.16.0 --- pkgs/tools/networking/clash-meta/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/clash-meta/default.nix b/pkgs/tools/networking/clash-meta/default.nix index 5c3f4c976b41..5c7e7706887c 100644 --- a/pkgs/tools/networking/clash-meta/default.nix +++ b/pkgs/tools/networking/clash-meta/default.nix @@ -4,16 +4,16 @@ }: buildGoModule rec { pname = "clash-meta"; - version = "1.15.1"; + version = "1.16.0"; src = fetchFromGitHub { owner = "MetaCubeX"; repo = "Clash.Meta"; rev = "v${version}"; - hash = "sha256-gOUG+XtLfkgnbTj1yUun50pevOh+aPXfIlof5/U2ud8="; + hash = "sha256-N7uCvzKBqOWYBfY1FBS9TjuHUfoKeMJF6o4k8C3f4z4="; }; - vendorHash = "sha256-My/fwa8BgaJcSGKcyyzUExVE0M2fk7rMZtOBW7V5edQ="; + vendorHash = "sha256-ySCmHLuMTCxBcAYo7YD8zOpUAa90PQmeLLt+uOn40Pk="; # Do not build testing suit excludedPackages = [ "./test" ]; From 376d892b75762d7adf0a45eb22b74ff471952a57 Mon Sep 17 00:00:00 2001 From: spacefrogg Date: Sun, 24 Sep 2023 17:53:20 +0200 Subject: [PATCH 17/33] goredo: 1.30 -> 1.31 --- pkgs/development/tools/build-managers/goredo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/goredo/default.nix b/pkgs/development/tools/build-managers/goredo/default.nix index 9284aae220ef..e1c2b402df69 100644 --- a/pkgs/development/tools/build-managers/goredo/default.nix +++ b/pkgs/development/tools/build-managers/goredo/default.nix @@ -9,11 +9,11 @@ buildGoModule rec { pname = "goredo"; - version = "1.30.0"; + version = "1.31.0"; src = fetchurl { url = "http://www.goredo.cypherpunks.ru/download/${pname}-${version}.tar.zst"; - hash = "sha256-glsg2q8jFd4z6CuKzlZ3afJx/S7Aw6LCxFAS/uHLlUg="; + hash = "sha256-z7u71VFMoq4VwHohMnYx/ahBSkRZHoI8MZet9gO+XVw="; }; patches = [ ./fix-tests.diff ]; From 2ef86dc8488665215739cc0d8990166fe28cfc2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corn=C3=A9=20Dorrestijn?= Date: Sun, 24 Sep 2023 22:10:44 +0200 Subject: [PATCH 18/33] updated hashes --- pkgs/development/web/bun/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix index 4749f4a1dd69..aeb611ef0f22 100644 --- a/pkgs/development/web/bun/default.nix +++ b/pkgs/development/web/bun/default.nix @@ -55,15 +55,15 @@ stdenvNoCC.mkDerivation rec { }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - hash = "sha256-xpV818IKE55ZdiLqgXupbFFNnnsRtBaIXUWJVfSeEnA="; + hash = "sha256-0Nto5EikWEvW6PCX6801qxDdlB1PtWJ1iym0mwh/YJI="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip"; - hash = "sha256-60rJzbuHxDqnfCjmO3givs4/xpOWOG8B7bTWR52xML4="; + hash = "sha256-3GUQk7Nv5Nx25SPk+Z+6EDNEsDbLW68IOXmLt8NkSYQ="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - hash = "sha256-c+/yHKIZAPmpwCRn7HLC39tj0nGeAK1qlby4UuILZRw="; + hash = "sha256-8xMBU3jloMsdekejKrnswWfzXhxwvsHFNgcUf4hn0W4="; }; }; updateScript = writeShellScript "update-bun" '' From 19c44fc47bb58d2667207d1d6d5619d5cb201b3b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 25 Sep 2023 09:15:35 +0200 Subject: [PATCH 19/33] python311Packages.aliyun-python-sdk-iot: 8.56.0 -> 8.57.0 Changelog: https://github.com/aliyun/aliyun-openapi-python-sdk/blob/master/aliyun-python-sdk-iot/ChangeLog.txt --- .../python-modules/aliyun-python-sdk-iot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix b/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix index 9f4098d6fa5b..2a753b425103 100644 --- a/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix +++ b/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "aliyun-python-sdk-iot"; - version = "8.56.0"; + version = "8.57.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-8d77P522c6gV8LhKErixzE2DvGmjr9bms+2eHYirgwg="; + hash = "sha256-Ea0IUn2mlu0c7QYJZkUrBUrtjUuTHoTeuvZHw/il+4A="; }; propagatedBuildInputs = [ From b9abb322774ccc19641858cdc0c5902474550e7f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 25 Sep 2023 09:20:07 +0200 Subject: [PATCH 20/33] python311Packages.wsgidav: 4.2.0 -> 4.3.0 Diff: https://github.com/mar10/wsgidav/compare/refs/tags/v4.2.0...v4.3.0 Changelog: https://github.com/mar10/wsgidav/blob/v4.3.0/CHANGELOG.md --- pkgs/development/python-modules/wsgidav/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wsgidav/default.nix b/pkgs/development/python-modules/wsgidav/default.nix index 9dc51364bc65..bff7c88f1463 100644 --- a/pkgs/development/python-modules/wsgidav/default.nix +++ b/pkgs/development/python-modules/wsgidav/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "wsgidav"; - version = "4.2.0"; + version = "4.3.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "mar10"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-1S3Zi92YRcu/PKNWJIn2ayr5Wbc+/+E7irFBQpMrKW8="; + hash = "sha256-DEUoKoFELIOg5KX6hL1VgR18dtsery4ZzKksrxl0D7Q="; }; nativeBuildInputs = [ From 192fd73631fc3c64117da7a1c80ce5fab99410e8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 25 Sep 2023 09:24:15 +0200 Subject: [PATCH 21/33] python311Packages.bluetooth-data-tools: 1.11.0 -> 1.12.0 Diff: https://github.com/Bluetooth-Devices/bluetooth-data-tools/compare/refs/tags/v1.11.0...v1.12.0 Changelog: https://github.com/Bluetooth-Devices/bluetooth-data-tools/blob/v1.12.0/CHANGELOG.md --- .../python-modules/bluetooth-data-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bluetooth-data-tools/default.nix b/pkgs/development/python-modules/bluetooth-data-tools/default.nix index 920bb1cecc48..608d7af455eb 100644 --- a/pkgs/development/python-modules/bluetooth-data-tools/default.nix +++ b/pkgs/development/python-modules/bluetooth-data-tools/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "bluetooth-data-tools"; - version = "1.11.0"; + version = "1.12.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-iyfk0OOJezNCNyqRCbR2cTTTdgdYQM6hExTngd/3CtA="; + hash = "sha256-zdMqjZ7CEwDnvVvIe1breQ+/4ZwzdLk2CtI+GCY+3uk="; }; # The project can build both an optimized cython version and an unoptimized From 892c75210b5cb824229f53e3e5b497bd8e5b4c1a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 25 Sep 2023 09:51:11 +0200 Subject: [PATCH 22/33] python311Packages.rns: 0.5.9 -> 0.6.0 Diff: https://github.com/markqvist/Reticulum/compare/refs/tags/0.5.9...0.6.0 Changelog: https://github.com/markqvist/Reticulum/releases/tag/0.6.0 --- pkgs/development/python-modules/rns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix index c180e5349b04..bb130d57af30 100644 --- a/pkgs/development/python-modules/rns/default.nix +++ b/pkgs/development/python-modules/rns/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "rns"; - version = "0.5.9"; + version = "0.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "Reticulum"; rev = "refs/tags/${version}"; - hash = "sha256-vzFN8b+F4CO/f/7CbUpX/Xj8wZMEpz2veUXsPHYzPxE="; + hash = "sha256-wlFDl7yCawLrijQMouFWcRoXmIJRcpHSAKFHyu+sMGk="; }; propagatedBuildInputs = [ From 68ae453d2469b621a4e6058a8e48238cba566348 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 25 Sep 2023 09:51:32 +0200 Subject: [PATCH 23/33] python311Packages.nomadnet: 0.3.7 -> 0.3.8 Diff: https://github.com/markqvist/NomadNet/compare/refs/tags/0.3.7...0.3.8 Changelog: https://github.com/markqvist/NomadNet/releases/tag/0.3.8 --- pkgs/development/python-modules/nomadnet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nomadnet/default.nix b/pkgs/development/python-modules/nomadnet/default.nix index 9415343d6ea7..18b4b3f7fa05 100644 --- a/pkgs/development/python-modules/nomadnet/default.nix +++ b/pkgs/development/python-modules/nomadnet/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "nomadnet"; - version = "0.3.7"; + version = "0.3.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "NomadNet"; rev = "refs/tags/${version}"; - hash = "sha256-cyD68GsAuJKmbVxWCCJVWz/VErB9LEdRzz9IT8ir+U0="; + hash = "sha256-w7NQH4CEfYQ4iwPtLQO5mYRnfWQbPuxb/qXRBP0V56Y="; }; propagatedBuildInputs = [ From 9eebc1ecaf1a07023db6c1854f3d3990dbdeaa6e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 25 Sep 2023 20:26:13 +0200 Subject: [PATCH 24/33] python311Packages.app-model: 0.2.1 -> 0.2.2 Diff: https://github.com/pyapp-kit/app-model/compare/refs/tags/v0.2.1...v0.2.2 Changelog: https://github.com/pyapp-kit/app-model/blob/v0.2.2/CHANGELOG.md --- pkgs/development/python-modules/app-model/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/app-model/default.nix b/pkgs/development/python-modules/app-model/default.nix index 29f19979ff53..1371cc72de3b 100644 --- a/pkgs/development/python-modules/app-model/default.nix +++ b/pkgs/development/python-modules/app-model/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "app-model"; - version = "0.2.1"; + version = "0.2.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "pyapp-kit"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-1LldqihVCCgFdnsod751zWAAqkaaIH2qMpfsPYjWzgs="; + hash = "sha256-vo10BHUzvYlldAqTw/1LxgvSXgTM3LAls9jQIeB5LcU="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 627167ee3963893a94f44fc5ce8e588e64e0c7dd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 25 Sep 2023 20:27:32 +0200 Subject: [PATCH 25/33] python311Packages.garth: 0.4.26 -> 0.4.27 --- pkgs/development/python-modules/garth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/garth/default.nix b/pkgs/development/python-modules/garth/default.nix index 0eaf2793caa8..224ebcca08a7 100644 --- a/pkgs/development/python-modules/garth/default.nix +++ b/pkgs/development/python-modules/garth/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "garth"; - version = "0.4.26"; + version = "0.4.27"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-Ezq9lZE6HTtuW396sKZ32mDvNjrkz6UHQGvLhXUjfnI="; + hash = "sha256-GOpYR1fudDKHbnxwAMCXrk95xYe0Pdi7pYebHua+IjM="; }; nativeBuildInputs = [ From f0dc8516ed53dbb677d4118c93334963ac1b086b Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 25 Sep 2023 22:10:28 +0200 Subject: [PATCH 26/33] build-support/php/hooks: add `cacert` --- pkgs/build-support/php/hooks/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/php/hooks/default.nix b/pkgs/build-support/php/hooks/default.nix index e7de98647c39..5ff69a877863 100644 --- a/pkgs/build-support/php/hooks/default.nix +++ b/pkgs/build-support/php/hooks/default.nix @@ -3,20 +3,21 @@ , moreutils , makeBinaryWrapper , php +, cacert }: { composerRepositoryHook = makeSetupHook { name = "composer-repository-hook.sh"; - propagatedBuildInputs = [ jq moreutils php ]; + propagatedBuildInputs = [ jq moreutils php cacert ]; substitutions = { }; } ./composer-repository-hook.sh; composerInstallHook = makeSetupHook { name = "composer-install-hook.sh"; - propagatedBuildInputs = [ jq makeBinaryWrapper moreutils php ]; + propagatedBuildInputs = [ jq makeBinaryWrapper moreutils php cacert ]; substitutions = { }; } ./composer-install-hook.sh; } From 486749fd7851f503a22dd7a3dd5c0d9eecbb32e0 Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Fri, 22 Sep 2023 18:13:03 +0200 Subject: [PATCH 27/33] pesign: init at 116 https://github.com/rhboot/pesign Linux tooling for signing PE-COFF binaries --- pkgs/by-name/pe/pesign/package.nix | 52 ++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 pkgs/by-name/pe/pesign/package.nix diff --git a/pkgs/by-name/pe/pesign/package.nix b/pkgs/by-name/pe/pesign/package.nix new file mode 100644 index 000000000000..b39db9cd430b --- /dev/null +++ b/pkgs/by-name/pe/pesign/package.nix @@ -0,0 +1,52 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, nss +, efivar +, util-linux +, popt +, nspr +, mandoc +}: + +stdenv.mkDerivation rec { + pname = "pesign"; + version = "116"; + + src = fetchFromGitHub { + owner = "rhboot"; + repo = "pesign"; + rev = version; + hash = "sha256-cuOSD/ZHkilgguDFJviIZCG8kceRWw2JgssQuWN02Do="; + }; + + # nss-util is missing because it is already contained in nss + # Red Hat seems to be shipping a separate nss-util: + # https://centos.pkgs.org/7/centos-x86_64/nss-util-devel-3.44.0-4.el7_7.x86_64.rpm.html + # containing things we already have in `nss`. + # We can ignore all the errors pertaining to a missing + # nss-util.pc I suppose. + buildInputs = [ efivar util-linux nss popt nspr mandoc ]; + nativeBuildInputs = [ pkg-config ]; + + makeFlags = [ "INSTALLROOT=$(out)" ]; + + postInstall = '' + mv $out/usr/bin $out/bin + mv $out/usr/share $out/share + + rm -rf $out/usr + rm -rf $out/etc + rm -rf $out/run + ''; + + meta = with lib; { + description = "Signing tools for PE-COFF binaries. Compliant with the PE and Authenticode specifications."; + homepage = "https://github.com/rhboot/pesign"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ raitobezarius ]; + # efivar is currently Linux-only. + platforms = platforms.linux; + }; +} From 8f107d8f4aad2f6980e4b6917d73d4599ce90f9f Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 25 Sep 2023 23:25:03 +0200 Subject: [PATCH 28/33] wxformbuilder: refactor --- pkgs/development/tools/wxformbuilder/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/wxformbuilder/default.nix b/pkgs/development/tools/wxformbuilder/default.nix index 2fccd17f2813..c8e05c1fc10b 100644 --- a/pkgs/development/tools/wxformbuilder/default.nix +++ b/pkgs/development/tools/wxformbuilder/default.nix @@ -10,7 +10,7 @@ }: stdenv.mkDerivation (finalAttrs: { - pname = "wxFormBuilder"; + pname = "wxformbuilder"; version = "unstable-2023-04-21"; src = fetchFromGitHub { @@ -47,13 +47,14 @@ stdenv.mkDerivation (finalAttrs: { postInstall = lib.optionalString stdenv.isDarwin '' mkdir -p $out/{Applications,bin} mv $out/wxFormBuilder.app $out/Applications - makeWrapper $out/{Applications/wxFormBuilder.app/Contents/MacOS,bin}/wxFormBuilder + makeWrapper $out/Applications/wxFormBuilder.app/Contents/MacOS/wxFormBuilder $out/bin/wxformbuilder ''; meta = with lib; { description = "RAD tool for wxWidgets GUI design"; homepage = "https://github.com/wxFormBuilder/wxFormBuilder"; license = licenses.gpl2Only; + mainProgram = "wxformbuilder"; maintainers = with maintainers; [ matthuszagh wegank ]; platforms = platforms.unix; }; From 0f24b2409c947cf72e894b712f5ec20ff6a73694 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Mon, 25 Sep 2023 02:39:08 +0200 Subject: [PATCH 29/33] python3Packages.pillow-heif: init at 0.13.0 --- .../python-modules/pillow-heif/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/pillow-heif/default.nix diff --git a/pkgs/development/python-modules/pillow-heif/default.nix b/pkgs/development/python-modules/pillow-heif/default.nix new file mode 100644 index 000000000000..fe243c6a0324 --- /dev/null +++ b/pkgs/development/python-modules/pillow-heif/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, cmake +, pillow +, pytest +, nasm +, libheif +, libaom +, libde265 +, x265 +}: + +buildPythonPackage rec { + pname = "pillow_heif"; + version = "0.13.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "bigcat88"; + repo = "pillow_heif"; + rev = "refs/tags/v${version}"; + hash = "sha256-GbOW29rGpLMS7AfShuO6UCzcspdHtFS7hyNKori0otI="; + }; + + nativeBuildInputs = [ cmake nasm ]; + buildInputs = [ libheif libaom libde265 x265 ]; + propagatedBuildInputs = [ pillow ]; + nativeCheckInputs = [ pytest ]; + + dontUseCmakeConfigure = true; + + pythonImportsCheck = [ "pillow_heif" ]; + + meta = { + description = "Python library for working with HEIF images and plugin for Pillow"; + homepage = "https://github.com/bigcat88/pillow_heif"; + license = with lib.licenses; [ bsd3 lgpl3 ]; + maintainers = with lib.maintainers; [ dandellion ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ce1944ea8d88..aac55bdb2680 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8190,6 +8190,8 @@ self: super: with self; { inherit (pkgs.xorg) libX11 libxcb; }; + pillow-heif = callPackage ../development/python-modules/pillow-heif { }; + pillow-simd = callPackage ../development/python-modules/pillow-simd { inherit (pkgs) freetype libjpeg zlib libtiff libwebp tcl lcms2 tk; inherit (pkgs.xorg) libX11; From 00a0c4c44152b05220675ff7bbfa2049b130c58f Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Tue, 28 Mar 2023 17:16:50 +0200 Subject: [PATCH 30/33] hydrus: 520 -> 544 Adds support for a bunch of media types Small improvements to the package --- .../graphics/hydrus/0001-inform-nixpkgs.patch | 18 ++++++++++++++++ pkgs/applications/graphics/hydrus/default.nix | 21 ++++++++++++++----- 2 files changed, 34 insertions(+), 5 deletions(-) create mode 100644 pkgs/applications/graphics/hydrus/0001-inform-nixpkgs.patch diff --git a/pkgs/applications/graphics/hydrus/0001-inform-nixpkgs.patch b/pkgs/applications/graphics/hydrus/0001-inform-nixpkgs.patch new file mode 100644 index 000000000000..e7200814eb05 --- /dev/null +++ b/pkgs/applications/graphics/hydrus/0001-inform-nixpkgs.patch @@ -0,0 +1,18 @@ +diff --git a/hydrus/core/HydrusConstants.py b/hydrus/core/HydrusConstants.py +index 809338ef..9125928f 100644 +--- a/hydrus/core/HydrusConstants.py ++++ b/hydrus/core/HydrusConstants.py +@@ -59,12 +59,7 @@ elif PLATFORM_HAIKU: + RUNNING_FROM_SOURCE = sys.argv[0].endswith( '.py' ) or sys.argv[0].endswith( '.pyw' ) + RUNNING_FROM_MACOS_APP = os.path.exists( os.path.join( BASE_DIR, 'running_from_app' ) ) + +-if RUNNING_FROM_SOURCE: +- NICE_RUNNING_AS_STRING = 'from source' +-elif RUNNING_FROM_FROZEN_BUILD: +- NICE_RUNNING_AS_STRING = 'from frozen build' +-elif RUNNING_FROM_MACOS_APP: +- NICE_RUNNING_AS_STRING = 'from App' ++NICE_RUNNING_AS_STRING = "from nixpkgs (source)" + + BIN_DIR = os.path.join( BASE_DIR, 'bin' ) + HELP_DIR = os.path.join( BASE_DIR, 'help' ) diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index ed8f2bef9e35..968f60ba8096 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -12,16 +12,21 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "520"; + version = "544"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - hash = "sha256-y8KfPe3cBBq/iPCG7hNXrZDkOSNi+qSir6rO/65SHkI="; + hash = "sha256-e3VvkdJAQx5heKDJ1Ms6XpXrXWdzv48f8yu0DHfPy1A="; }; + patches = [ + # Nixpkgs specific, can be removed if upstream makes a more reasonable check + ./0001-inform-nixpkgs.patch + ]; + nativeBuildInputs = [ wrapQtAppsHook python3Packages.mkdocs-material @@ -37,13 +42,16 @@ python3Packages.buildPythonPackage rec { cbor2 chardet cloudscraper + dateparser html5lib lxml lz4 numpy opencv4 pillow + pillow-heif psutil + psd-tools pympler pyopenssl pyqt6 @@ -56,7 +64,6 @@ python3Packages.buildPythonPackage rec { requests send2trash service-identity - six twisted ]; @@ -92,6 +99,7 @@ python3Packages.buildPythonPackage rec { -e TestHydrusSessions \ -e TestServer \ -e TestClientMetadataMigration \ + -e TestClientFileStorage \ ''; outputs = [ "out" "doc" ]; @@ -100,13 +108,16 @@ python3Packages.buildPythonPackage rec { # Move the hydrus module and related directories mkdir -p $out/${python3Packages.python.sitePackages} mv {hydrus,static} $out/${python3Packages.python.sitePackages} + # Fix random files being marked with execute permissions + chmod -x $out/${python3Packages.python.sitePackages}/static/*.{png,svg,ico} + # Build docs mkdocs build -d help mv help $out/doc/ # install the hydrus binaries mkdir -p $out/bin - install -m0755 server.py $out/bin/hydrus-server - install -m0755 client.py $out/bin/hydrus-client + install -m0755 hydrus_server.py $out/bin/hydrus-server + install -m0755 hydrus_client.py $out/bin/hydrus-client '' + lib.optionalString enableSwftools '' mkdir -p $out/${python3Packages.python.sitePackages}/bin # swfrender seems to have to be called sfwrender_linux From 4bae9b18f88f685a2efdac87db60593f23eb953f Mon Sep 17 00:00:00 2001 From: happysalada Date: Mon, 25 Sep 2023 16:58:52 -0400 Subject: [PATCH 31/33] nushellPlugins: hash fixes --- pkgs/shells/nushell/plugins/formats.nix | 4 ++-- pkgs/shells/nushell/plugins/gstat.nix | 2 +- pkgs/shells/nushell/plugins/query.nix | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/shells/nushell/plugins/formats.nix b/pkgs/shells/nushell/plugins/formats.nix index 8c511782e3de..f55c8c5eae2a 100644 --- a/pkgs/shells/nushell/plugins/formats.nix +++ b/pkgs/shells/nushell/plugins/formats.nix @@ -14,9 +14,9 @@ rustPlatform.buildRustPackage { inherit pname; version = "0.85.0"; src = nushell.src; - cargoHash = "sha256-OKtktjBOujvljAX260TbC2sQWZOiGgU+sXsbYRhGPRM="; + cargoHash = "sha256-WS8VRpJnn/VWS7GUkGowFf51ifUx0SbEZzcoTfx2dp0="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ IOKit Foundation ]; + buildInputs = lib.optionals stdenv.isDarwin [ IOKit Foundation ]; cargoBuildFlags = [ "--package nu_plugin_formats" ]; doCheck = false; meta = with lib; { diff --git a/pkgs/shells/nushell/plugins/gstat.nix b/pkgs/shells/nushell/plugins/gstat.nix index f7e912a6fdc6..589eda96b069 100644 --- a/pkgs/shells/nushell/plugins/gstat.nix +++ b/pkgs/shells/nushell/plugins/gstat.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage { inherit pname; version = "0.85.0"; src = nushell.src; - cargoHash = "sha256-Fj70uKYzEKxeZeNrqlwM7ZFJ+K1tz10RqLndrdY40CE="; + cargoHash = "sha256-6luY3SIRRd9vaY9KIJcj8Q974FW0LtAvRjVpdpzkdLo="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; cargoBuildFlags = [ "--package nu_plugin_gstat" ]; diff --git a/pkgs/shells/nushell/plugins/query.nix b/pkgs/shells/nushell/plugins/query.nix index 51db91bec266..feaeb7f63d11 100644 --- a/pkgs/shells/nushell/plugins/query.nix +++ b/pkgs/shells/nushell/plugins/query.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage { src = nushell.src; - cargoHash = "sha256-8iUqOdGWm2kDW72ptlCBIqqe4zjckN09MOQD77kCf5Y="; + cargoHash = "sha256-xyty3GfI+zNkuHs7LYHBctqXUHZ4/MNNcnnfYvI18do="; buildInputs = lib.optionals stdenv.isDarwin [ IOKit CoreFoundation ]; From 2390c41bd637f5ecb07d4b287a38aabef55363cb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Sep 2023 02:13:40 +0000 Subject: [PATCH 32/33] symfony-cli: 5.5.8 -> 5.5.9 --- pkgs/development/tools/symfony-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/symfony-cli/default.nix b/pkgs/development/tools/symfony-cli/default.nix index acae7f04f6af..2a1bbbeed512 100644 --- a/pkgs/development/tools/symfony-cli/default.nix +++ b/pkgs/development/tools/symfony-cli/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "symfony-cli"; - version = "5.5.8"; - vendorHash = "sha256-hOYVIynWsbsindNJRbXX4NkC3FW3RErORCSLlV1bCWc="; + version = "5.5.9"; + vendorHash = "sha256-eeVi/O4p7bF4CPqJBCpLfx1Yc5vZZ3b8RV5ERcIL8H4="; src = fetchFromGitHub { owner = "symfony-cli"; repo = "symfony-cli"; rev = "v${version}"; - hash = "sha256-K2DttdK8g5NI+XlGwIA9HTPTLlMGgGc1K625FquIhi4="; + hash = "sha256-dQ7ImNSnWD2u9cY9VEBlum45YqlhHgczAkD70QJFr68="; }; ldflags = [ From 3a92ac740d179f584c5fa6ed60ea09fbcf4ce56e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Sep 2023 04:32:27 +0000 Subject: [PATCH 33/33] php81Extensions.phalcon: 5.3.0 -> 5.3.1 --- pkgs/development/php-packages/phalcon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/phalcon/default.nix b/pkgs/development/php-packages/phalcon/default.nix index 6f998be9a1f6..cbd689b136b9 100644 --- a/pkgs/development/php-packages/phalcon/default.nix +++ b/pkgs/development/php-packages/phalcon/default.nix @@ -2,13 +2,13 @@ buildPecl rec { pname = "phalcon"; - version = "5.3.0"; + version = "5.3.1"; src = fetchFromGitHub { owner = "phalcon"; repo = "cphalcon"; rev = "v${version}"; - hash = "sha256-82DJ+Qx0OYhw9Nv6FkAoyBec8WWfAiqNfBU9Ll/8RfA="; + hash = "sha256-FxGibpGlbNLqWDplCv4T4yUPg5US020niLfC7tHfkCU="; }; internalDeps = [ php.extensions.session php.extensions.pdo ];