From 27c86c79882c21d0a855a877be99f9c19852a1e2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Feb 2025 06:40:13 +0000 Subject: [PATCH 01/33] python312Packages.evdev: 1.9.0 -> 1.9.1 --- pkgs/development/python-modules/evdev/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/evdev/default.nix b/pkgs/development/python-modules/evdev/default.nix index 719c7d2cbaa5..24bbd2bc6ec3 100644 --- a/pkgs/development/python-modules/evdev/default.nix +++ b/pkgs/development/python-modules/evdev/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "evdev"; - version = "1.9.0"; + version = "1.9.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-OCGLyVUHytdWvGIaX+enekHrjZwSE4Vd6OS6Croo558="; + hash = "sha256-3GQKBkyxyf4fi5cNwgOZRaKidde37mIoS/QnI4q+Re4="; }; patchPhase = '' From 3630050b75e4fb20973b8d3fce67a5d5755ce77d Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Thu, 6 Mar 2025 14:56:16 +0000 Subject: [PATCH 02/33] sdl3: 3.2.6 -> 3.2.8 Diff: https://github.com/libsdl-org/SDL/compare/release-3.2.6...release-3.2.8 Changelog: https://github.com/libsdl-org/SDL/releases/tag/release-3.2.8 --- pkgs/by-name/sd/sdl3/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sd/sdl3/package.nix b/pkgs/by-name/sd/sdl3/package.nix index fea18b66aed7..85f70a5964ac 100644 --- a/pkgs/by-name/sd/sdl3/package.nix +++ b/pkgs/by-name/sd/sdl3/package.nix @@ -57,7 +57,7 @@ assert lib.assertMsg ( stdenv.mkDerivation (finalAttrs: { pname = "sdl3"; - version = "3.2.6"; + version = "3.2.8"; outputs = [ "lib" @@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "libsdl-org"; repo = "SDL"; tag = "release-${finalAttrs.version}"; - hash = "sha256-SEL/JIenmueYayxZlWlMO3lTUOcqiaZZC6RJbbH4DmE="; + hash = "sha256-BpNo8t0st8v2cTV2iSrjvjCPiDa26NwkWXgMGKFkeAQ="; }; postPatch = From 65bc040a6f33ff2985b49b182cf53f5e005ef2f8 Mon Sep 17 00:00:00 2001 From: DSeeLP <46624152+DSeeLP@users.noreply.github.com> Date: Tue, 11 Mar 2025 11:44:08 +0100 Subject: [PATCH 03/33] nixos/hickory-dns: combine Hint and Forward zone types into one In 0.25.0-alpha.5 the Hint and Forward zone types where combined into External --- nixos/modules/services/networking/hickory-dns.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/networking/hickory-dns.nix b/nixos/modules/services/networking/hickory-dns.nix index 6a6570e58017..3d4edfbae74c 100644 --- a/nixos/modules/services/networking/hickory-dns.nix +++ b/nixos/modules/services/networking/hickory-dns.nix @@ -13,14 +13,13 @@ let ''; }; zone_type = mkOption { - type = types.enum [ "Primary" "Secondary" "Hint" "Forward" ]; + type = types.enum [ "Primary" "Secondary" "External" ]; default = "Primary"; description = '' One of: - "Primary" (the master, authority for the zone). - "Secondary" (the slave, replicated from the primary). - - "Hint" (a cached zone with recursive resolver abilities). - - "Forward" (a cached zone where all requests are forwarded to another resolver). + - "External" (a cached zone that queries other nameservers). For more details about these zone types, consult the documentation for BIND, though note that hickory-dns supports only a subset of BIND's zone types: @@ -28,13 +27,13 @@ let ''; }; file = mkOption { - type = types.either types.path types.str; - default = "${config.zone}.zone"; - defaultText = literalExpression ''"''${config.zone}.zone"''; + type = types.nullOr (types.either types.path types.str); + default = if config.zone_type != "External" then "${config.zone}.zone" else null; + defaultText = literalExpression ''if config.zone_type != "External" then "''${config.zone}.zone" else null''; description = '' Path to the .zone file. If not fully-qualified, this path will be interpreted relative to the `directory` option. - If omitted, defaults to the value of the `zone` option suffixed with ".zone". + If omitted, defaults to the value of the `zone` option suffixed with ".zone" when `zone_type` isn't External; otherwise, defaults to `null`. ''; }; }; @@ -82,7 +81,7 @@ in configFile = mkOption { type = types.path; default = toml.generate "hickory-dns.toml" ( - lib.filterAttrsRecursive (_: v: v != null) cfg.settings + lib.mapAttrs (_: v: if builtins.isList v then map (v: if builtins.isAttrs v then lib.filterAttrs (_: v: v != null) v else v) v else v) (lib.filterAttrsRecursive (_: v: v != null) cfg.settings) ); defaultText = lib.literalExpression '' let toml = pkgs.formats.toml { }; in toml.generate "hickory-dns.toml" cfg.settings From 18bdb5cd493b12e3ac50a3d312d92fb64f2b5ca9 Mon Sep 17 00:00:00 2001 From: Reputable2722 <153411261+Reputable2772@users.noreply.github.com> Date: Sun, 16 Mar 2025 15:13:23 +0530 Subject: [PATCH 04/33] keet: 2.2.0 -> 2.4.1 Signed-off-by: Reputable2722 <153411261+Reputable2772@users.noreply.github.com> --- pkgs/by-name/ke/keet/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ke/keet/package.nix b/pkgs/by-name/ke/keet/package.nix index 49f8bb2b82d8..179a8207e52d 100644 --- a/pkgs/by-name/ke/keet/package.nix +++ b/pkgs/by-name/ke/keet/package.nix @@ -6,11 +6,11 @@ let pname = "keet"; - version = "2.2.0"; + version = "2.4.1"; src = fetchzip { url = "https://keet.io/downloads/${version}/Keet-x64.tar.gz"; - hash = "sha256-Sd2aCUvgxdbCb8MtWMcznX2efmL1h9wLT29GG7t3Gzc="; + hash = "sha256-Csr9M9t2brwfK0B8ldXgUQXX6lPH8z2QSkcBgCYSvaE="; }; appimageContents = appimageTools.extract { @@ -26,6 +26,7 @@ appimageTools.wrapType2 { extraPkgs = pkgs: with pkgs; [ gtk4 + graphene ]; extraInstallCommands = '' From fb385d93845243654fc5133a66f66de372ecd1fd Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Sun, 16 Mar 2025 16:06:19 +0200 Subject: [PATCH 05/33] qastools: 0.23.0 -> 1.4.0 * Update to actual 1.4.0 version * Modernize * Switch to Qt6 * Move to pkgs/by-name * Add myself as maintainer Signed-off-by: Alexander V. Nikolaev --- .../qa/qastools/package.nix} | 37 +++++++++++-------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 22 insertions(+), 17 deletions(-) rename pkgs/{tools/audio/qastools/default.nix => by-name/qa/qastools/package.nix} (50%) diff --git a/pkgs/tools/audio/qastools/default.nix b/pkgs/by-name/qa/qastools/package.nix similarity index 50% rename from pkgs/tools/audio/qastools/default.nix rename to pkgs/by-name/qa/qastools/package.nix index 37af3d9e7a61..b94318db64e2 100644 --- a/pkgs/tools/audio/qastools/default.nix +++ b/pkgs/by-name/qa/qastools/package.nix @@ -1,40 +1,47 @@ { - mkDerivation, + stdenv, lib, fetchFromGitLab, cmake, alsa-lib, udev, - qtbase, - qtsvg, - qttools, + qt6Packages, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "qastools"; - version = "0.23.0"; + version = "1.4.0"; src = fetchFromGitLab { owner = "sebholt"; repo = pname; rev = "v${version}"; - sha256 = "19hn64hnvryfmrkdg6rqyzahdbqf1s5y3dcca389jj6sdx93b3ip"; + hash = "sha256-mJjhM1y50f44kvxMidM7uqlkkXx1sbJC21vIMEDenoU="; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ - alsa-lib - udev - qtbase - qtsvg - qttools + nativeBuildInputs = [ + cmake + qt6Packages.wrapQtAppsHook ]; + buildInputs = + [ + alsa-lib + udev + ] + ++ (with qt6Packages; [ + qtbase + qtsvg + qttools + ]); meta = with lib; { description = "Collection of desktop applications for ALSA configuration"; homepage = "https://gitlab.com/sebholt/qastools"; license = licenses.mit; - maintainers = with maintainers; [ orivej ]; + maintainers = with maintainers; [ + avnik + orivej + ]; platforms = platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c13fd742be3..7a81833c89f0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4745,8 +4745,6 @@ with pkgs; quickbms = pkgsi686Linux.callPackage ../tools/archivers/quickbms { }; - qastools = libsForQt5.callPackage ../tools/audio/qastools { }; - qdigidoc = libsForQt5.callPackage ../tools/security/qdigidoc { } ; qjournalctl = libsForQt5.callPackage ../applications/system/qjournalctl { }; From 57b8c66e11acfbd9367161d4d29858aea5ab4e46 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Mar 2025 18:22:41 +0000 Subject: [PATCH 06/33] c-intro-and-ref: 0.0-unstable-2024-08-31 -> 0-unstable-2025-03-09 --- pkgs/by-name/c-/c-intro-and-ref/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/c-/c-intro-and-ref/package.nix b/pkgs/by-name/c-/c-intro-and-ref/package.nix index b1b212e1c765..bdc17ec47a98 100644 --- a/pkgs/by-name/c-/c-intro-and-ref/package.nix +++ b/pkgs/by-name/c-/c-intro-and-ref/package.nix @@ -9,12 +9,12 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "c-intro-and-ref"; - version = "0.0-unstable-2024-08-31"; + version = "0-unstable-2025-03-09"; src = fetchFromSavannah { repo = "c-intro-and-ref"; - rev = "62962013107481127176ef04d69826e41f51313c"; - hash = "sha256-Fmli3x8zvPntvCvV/wbEkxWzW9uDMZgCElPkKo9TS6Y="; + rev = "11723f5d07331708985dfd3eb9b05163dde990e5"; + hash = "sha256-quTeOQKTX/Aq78vMJPsjVQyisADzWm9mtLE1HoJByl4="; }; nativeBuildInputs = [ From 61bf49c70189d4bcee2a1092325d568896966091 Mon Sep 17 00:00:00 2001 From: fqidz Date: Sun, 16 Mar 2025 21:08:24 +0300 Subject: [PATCH 07/33] honggfuzz: fix broken includes path for hfuzz-cc --- pkgs/tools/security/honggfuzz/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/honggfuzz/default.nix b/pkgs/tools/security/honggfuzz/default.nix index 3515430b965c..945020445950 100644 --- a/pkgs/tools/security/honggfuzz/default.nix +++ b/pkgs/tools/security/honggfuzz/default.nix @@ -41,7 +41,13 @@ stdenv.mkDerivation rec { # Fortify causes build failures: 'str*' defined both normally and as 'alias' attribute hardeningDisable = [ "fortify" ]; - makeFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ + "PREFIX=$(out)" + # hfuzz-cc can only find 'includes' folder (instead of 'include') + # Defined here: https://github.com/google/honggfuzz/blob/defed1013fdacd7090617ecc1ced8bdcc3c617d6/hfuzz_cc/hfuzz-cc.c#L273 + "INC_PATH=$(PREFIX)/includes" + "HFUZZ_INC=$(out)" + ]; postInstall = '' mkdir -p $out/lib From 2a178d6eeb71591a72fa674852d3e95ddeacae19 Mon Sep 17 00:00:00 2001 From: emaryn Date: Mon, 17 Mar 2025 18:14:40 +0800 Subject: [PATCH 08/33] waydroid-helper: fix Namespace Adw --- pkgs/by-name/wa/waydroid-helper/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/wa/waydroid-helper/package.nix b/pkgs/by-name/wa/waydroid-helper/package.nix index 57e8a0d3eabe..6f7e609321a3 100644 --- a/pkgs/by-name/wa/waydroid-helper/package.nix +++ b/pkgs/by-name/wa/waydroid-helper/package.nix @@ -16,6 +16,7 @@ dbus, systemd, bash, + gobject-introspection, }: python3Packages.buildPythonApplication rec { @@ -53,6 +54,7 @@ python3Packages.buildPythonApplication rec { pkg-config wrapGAppsHook4 desktop-file-utils + gobject-introspection ]; buildInputs = [ From 8cd320a05edb2be9f661db2795c8e0b4cca6d349 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Mar 2025 14:30:56 +0000 Subject: [PATCH 09/33] irust: 1.71.30 -> 1.72.0 --- pkgs/by-name/ir/irust/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ir/irust/package.nix b/pkgs/by-name/ir/irust/package.nix index 0bdd63b1c0a9..83c2880931db 100644 --- a/pkgs/by-name/ir/irust/package.nix +++ b/pkgs/by-name/ir/irust/package.nix @@ -21,17 +21,17 @@ rustPlatform.buildRustPackage rec { pname = "irust"; - version = "1.71.30"; + version = "1.72.0"; src = fetchFromGitHub { owner = "sigmaSd"; repo = "IRust"; rev = "irust@${version}"; - hash = "sha256-moYHi+hkL2I3jm3eBfaXuK4Zz84Pq2X50V5lKyIMecM="; + hash = "sha256-PRs6pG2aJQkmsZ1nRBaOTIrmjcYnaI9zZIHKJS/pueQ="; }; useFetchCargoVendor = true; - cargoHash = "sha256-NUivVSIbyLCU5VP1F6VETMRwDNzuIUvoCI/bbJSxX1g="; + cargoHash = "sha256-oWMKJLVmJ/UQuTNUwZ7VWOFtFa/mJGgbRMQC3aNK3Y0="; nativeBuildInputs = [ makeWrapper ]; From 5364044ab6de546588762aa95ea582d6d43afc6a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Mar 2025 22:16:01 +0000 Subject: [PATCH 10/33] xfe: 2.0 -> 2.0.1 --- pkgs/applications/file-managers/xfe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/file-managers/xfe/default.nix b/pkgs/applications/file-managers/xfe/default.nix index d0466a3a64bb..1f28b59322fc 100644 --- a/pkgs/applications/file-managers/xfe/default.nix +++ b/pkgs/applications/file-managers/xfe/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "xfe"; - version = "2.0"; + version = "2.0.1"; src = fetchurl { url = "mirror://sourceforge/xfe/xfe-${version}.tar.xz"; - sha256 = "sha256-oGqBZjBL/Uc1+ZJZCVnUxwFvWAT+2mQGZgygTZuymEg="; + sha256 = "sha256-vlu0yshT72rWQB0aqCleIsdJSZ4kEL8MUsYET1VqJbM="; }; nativeBuildInputs = [ From bfcb34cd0f2aaec1a8a48c1029ce33baca13c91d Mon Sep 17 00:00:00 2001 From: emaryn Date: Wed, 19 Mar 2025 16:47:25 +0800 Subject: [PATCH 11/33] marble-shell-theme: 46.2.3 -> 47.0 --- .../by-name/ma/marble-shell-theme/package.nix | 28 +++++++++++++------ 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/ma/marble-shell-theme/package.nix b/pkgs/by-name/ma/marble-shell-theme/package.nix index b23c2201c639..bc3e8687257d 100644 --- a/pkgs/by-name/ma/marble-shell-theme/package.nix +++ b/pkgs/by-name/ma/marble-shell-theme/package.nix @@ -3,37 +3,47 @@ stdenvNoCC, fetchFromGitHub, python3, + gnome-shell, + dconf, + writableTmpDirAsHomeHook, colors ? [ "all" ], # Default to install all available colors additionalInstallationTweaks ? [ ], # Additional installation tweaks }: + assert lib.assertMsg (colors != [ ]) "The `colors` list can not be empty"; + stdenvNoCC.mkDerivation (finalAttrs: { pname = "marble-shell-theme"; - version = "46.2.3"; + version = "47.0"; src = fetchFromGitHub { owner = "imarkoff"; repo = "Marble-shell-theme"; - rev = "5971b15d8115c60c3a16b1d219ecffd2cfcdb323"; - hash = "sha256-TX6BSS29EAi2PjL1fMvEKD12RjB9xrfqPSQsJJrUcJg="; + tag = finalAttrs.version; + hash = "sha256-+uPjwOUwrdFfBvpWtuZhe789v2xvZG3XeFyYw8HP8QM="; }; - nativeBuildInputs = [ python3 ]; + nativeBuildInputs = [ + python3 + gnome-shell + dconf + writableTmpDirAsHomeHook + ]; - patchPhase = '' - runHook prePatch + postPatch = '' substituteInPlace scripts/config.py \ --replace-fail "~/.themes" ".themes" - runHook postPatch ''; installPhase = '' runHook preInstall - mkdir -p $out/share/themes + python install.py ${ lib.escapeShellArgs (map (color: "--${color}") colors) } ${lib.escapeShellArgs additionalInstallationTweaks} - cp -r .themes/* $out/share/themes/ + mkdir -p $out/share + cp -r .themes $out/share/themes + runHook postInstall ''; From 974af3844d60294aee73d446be10db5850db8e11 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Wed, 19 Mar 2025 13:28:53 -0500 Subject: [PATCH 12/33] youplot: Update ruby gems to latest versions and deduplicate gems. --- pkgs/by-name/yo/youplot/Gemfile.lock | 6 ++--- pkgs/by-name/yo/youplot/gemset.nix | 35 +++++++++++++++------------- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/yo/youplot/Gemfile.lock b/pkgs/by-name/yo/youplot/Gemfile.lock index b12bb2c00944..31291cd98a91 100644 --- a/pkgs/by-name/yo/youplot/Gemfile.lock +++ b/pkgs/by-name/yo/youplot/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - csv (3.3.0) + csv (3.3.2) enumerable-statistics (2.0.8) unicode_plot (0.0.5) enumerable-statistics (>= 2.0.1) @@ -10,12 +10,10 @@ GEM unicode_plot (>= 0.0.5) PLATFORMS - x86_64-linux - arm64-darwin-22 ruby DEPENDENCIES youplot BUNDLED WITH - 2.5.16 + 2.6.2 diff --git a/pkgs/by-name/yo/youplot/gemset.nix b/pkgs/by-name/yo/youplot/gemset.nix index 627338314559..c93e752d6a9f 100644 --- a/pkgs/by-name/yo/youplot/gemset.nix +++ b/pkgs/by-name/yo/youplot/gemset.nix @@ -1,41 +1,44 @@ { csv = { - groups = ["default"]; - platforms = []; + groups = [ "default" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; - sha256 = "0zfn40dvgjk1xv1z8l11hr9jfg3jncwsc9yhzsz4l4rivkpivg8b"; + remotes = [ "https://rubygems.org" ]; + sha256 = "0kmx36jjh2sahd989vcvw74lrlv07dqc3rnxchc5sj2ywqsw3w3g"; type = "gem"; }; - version = "3.3.0"; + version = "3.3.2"; }; enumerable-statistics = { - groups = ["default"]; - platforms = []; + groups = [ "default" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "1cqksgv0cf69cd30kxk2r0lq1y784wn5nvlyabfqilf1vvy6j38y"; type = "gem"; }; version = "2.0.8"; }; unicode_plot = { - dependencies = ["enumerable-statistics"]; - groups = ["default"]; - platforms = []; + dependencies = [ "enumerable-statistics" ]; + groups = [ "default" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "0fzpg1zizf19xgfzqw6lmb38xir423wwxb2mjsb3nym6phvn5kli"; type = "gem"; }; version = "0.0.5"; }; youplot = { - dependencies = ["csv" "unicode_plot"]; - groups = ["default"]; - platforms = []; + dependencies = [ + "csv" + "unicode_plot" + ]; + groups = [ "default" ]; + platforms = [ ]; source = { - remotes = ["https://rubygems.org"]; + remotes = [ "https://rubygems.org" ]; sha256 = "1p1vbb7p4h5a4r2rwl64gwv6cmf350grjn97zrpjhvrjih81y3yg"; type = "gem"; }; From 881e1ea94bb83d8bf65e88b01b89919554236e7c Mon Sep 17 00:00:00 2001 From: PassiveLemon Date: Wed, 19 Mar 2025 16:09:08 -0400 Subject: [PATCH 13/33] wivrn: fix OPENCOMPOSITE_SEARCH_PATH --- pkgs/by-name/wi/wivrn/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/wi/wivrn/package.nix b/pkgs/by-name/wi/wivrn/package.nix index 3b4d7b99d146..a55ee1dc5cf4 100644 --- a/pkgs/by-name/wi/wivrn/package.nix +++ b/pkgs/by-name/wi/wivrn/package.nix @@ -214,7 +214,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "WIVRN_CHECK_CAPSYSNICE" false) (lib.cmakeBool "FETCHCONTENT_FULLY_DISCONNECTED" true) (lib.cmakeFeature "WIVRN_OPENXR_MANIFEST_TYPE" "absolute") - (lib.cmakeFeature "OPENCOMPOSITE_SEARCH_PATH" "${opencomposite}") + (lib.cmakeFeature "OPENCOMPOSITE_SEARCH_PATH" "${opencomposite}/lib/opencomposite") (lib.cmakeFeature "GIT_DESC" "v${finalAttrs.version}") (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_MONADO" "${finalAttrs.monado}") ] From d87d01568678bc2acc63dab96b231162ec2f097f Mon Sep 17 00:00:00 2001 From: Farid Zakaria Date: Wed, 19 Mar 2025 16:35:12 -0700 Subject: [PATCH 14/33] granted: fix config folder The config folder in granted is set to `.dgranted` by default. https://github.com/common-fate/granted/blob/e1f1b5ab75424d4534ac715c33d6d1049936e3ba/internal/build/config.go#L5 The `d` is the "development. Looks like in a typical release process this is overwritten to be `.granted`. --- pkgs/by-name/gr/granted/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/gr/granted/package.nix b/pkgs/by-name/gr/granted/package.nix index 1339b6dfdcf6..510d676a1549 100644 --- a/pkgs/by-name/gr/granted/package.nix +++ b/pkgs/by-name/gr/granted/package.nix @@ -31,6 +31,7 @@ buildGoModule rec { "-X github.com/common-fate/granted/internal/build.Commit=${src.rev}" "-X github.com/common-fate/granted/internal/build.Date=1970-01-01-00:00:01" "-X github.com/common-fate/granted/internal/build.BuiltBy=Nix" + "-X github.com/common-fate/granted/internal/build.ConfigFolderName=.granted" ]; subPackages = [ From f2437fece1b89b93e44127f4780720b96b6115ad Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 20 Mar 2025 08:43:05 -0500 Subject: [PATCH 15/33] gemstash: Update gems to latest version and make gems platform agnostic. --- pkgs/development/tools/gemstash/Gemfile.lock | 56 +++++----- pkgs/development/tools/gemstash/gemset.nix | 103 +++++++++++++------ 2 files changed, 95 insertions(+), 64 deletions(-) diff --git a/pkgs/development/tools/gemstash/Gemfile.lock b/pkgs/development/tools/gemstash/Gemfile.lock index e091a27c0f86..92112368f9a2 100644 --- a/pkgs/development/tools/gemstash/Gemfile.lock +++ b/pkgs/development/tools/gemstash/Gemfile.lock @@ -1,8 +1,9 @@ GEM remote: https://rubygems.org/ specs: - activesupport (7.2.1.2) + activesupport (7.2.2.1) base64 + benchmark (>= 0.3) bigdecimal concurrent-ruby (~> 1.0, >= 1.3.1) connection_pool (>= 2.2.5) @@ -13,10 +14,12 @@ GEM securerandom (>= 0.3) tzinfo (~> 2.0, >= 2.0.5) base64 (0.2.0) - bigdecimal (3.1.8) - concurrent-ruby (1.3.4) - connection_pool (2.4.1) + benchmark (0.4.0) + bigdecimal (3.1.9) + concurrent-ruby (1.3.5) + connection_pool (2.5.0) dalli (3.2.8) + date (3.4.1) drb (2.2.1) faraday (1.10.4) faraday-em_http (~> 1.0) @@ -34,8 +37,8 @@ GEM faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) faraday-httpclient (1.0.1) - faraday-multipart (1.0.4) - multipart-post (~> 2) + faraday-multipart (1.1.0) + multipart-post (~> 2.0) faraday-net_http (1.0.2) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) @@ -57,26 +60,28 @@ GEM sqlite3 (~> 1.3) terminal-table (~> 3.0) thor (~> 1.0) - i18n (1.14.6) + i18n (1.14.7) concurrent-ruby (~> 1.0) - logger (1.6.1) + logger (1.6.6) lru_redux (1.1.0) - minitest (5.25.1) + mini_portile2 (2.8.8) + minitest (5.25.5) multipart-post (2.4.1) mustermann (3.0.3) ruby2_keywords (~> 0.0.1) - nio4r (2.7.3) - psych (5.1.2) + nio4r (2.7.4) + psych (5.2.3) + date stringio - puma (6.4.3) + puma (6.6.0) nio4r (~> 2.0) - rack (2.2.10) + rack (2.2.13) rack-protection (3.2.0) base64 (>= 0.1.0) rack (~> 2.2, >= 2.2.4) ruby2_keywords (0.0.5) - securerandom (0.3.1) - sequel (5.85.0) + securerandom (0.4.1) + sequel (5.90.0) bigdecimal server_health_check (1.0.2) server_health_check-rack (0.1.0) @@ -86,31 +91,22 @@ GEM rack (~> 2.2, >= 2.2.4) rack-protection (= 3.2.0) tilt (~> 2.0) - sqlite3 (1.7.3-aarch64-linux) - sqlite3 (1.7.3-arm-linux) - sqlite3 (1.7.3-arm64-darwin) - sqlite3 (1.7.3-x86-linux) - sqlite3 (1.7.3-x86_64-darwin) - sqlite3 (1.7.3-x86_64-linux) - stringio (3.1.1) + sqlite3 (1.7.3) + mini_portile2 (~> 2.8.0) + stringio (3.1.5) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) thor (1.3.2) - tilt (2.4.0) + tilt (2.6.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) unicode-display_width (2.6.0) PLATFORMS - aarch64-linux - arm-linux - arm64-darwin - x86-linux - x86_64-darwin - x86_64-linux + ruby DEPENDENCIES gemstash BUNDLED WITH - 2.5.17 + 2.6.2 diff --git a/pkgs/development/tools/gemstash/gemset.nix b/pkgs/development/tools/gemstash/gemset.nix index 40f7f09fe9e2..afa40fa2c182 100644 --- a/pkgs/development/tools/gemstash/gemset.nix +++ b/pkgs/development/tools/gemstash/gemset.nix @@ -2,6 +2,7 @@ activesupport = { dependencies = [ "base64" + "benchmark" "bigdecimal" "concurrent-ruby" "connection_pool" @@ -16,10 +17,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1cacrvmn1561fb88fn99ig52wdz1k67s7vbssqwwwljf1kanlgvc"; + sha256 = "1xa7hr4gp2p86ly6n1j2skyx8pfg6yi621kmnh7zhxr9m7wcnaw4"; type = "gem"; }; - version = "7.2.1.2"; + version = "7.2.2.1"; }; base64 = { groups = [ "default" ]; @@ -31,35 +32,45 @@ }; version = "0.2.0"; }; + benchmark = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0jl71qcgamm96dzyqk695j24qszhcc7liw74qc83fpjljp2gh4hg"; + type = "gem"; + }; + version = "0.4.0"; + }; bigdecimal = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1gi7zqgmqwi5lizggs1jhc3zlwaqayy9rx2ah80sxy24bbnng558"; + sha256 = "1k6qzammv9r6b2cw3siasaik18i6wjc5m0gw5nfdc6jj64h79z1g"; type = "gem"; }; - version = "3.1.8"; + version = "3.1.9"; }; concurrent-ruby = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl"; + sha256 = "1ipbrgvf0pp6zxdk5ascp6i29aybz2bx9wdrlchjmpx6mhvkwfw1"; type = "gem"; }; - version = "1.3.4"; + version = "1.3.5"; }; connection_pool = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1x32mcpm2cl5492kd6lbjbaf17qsssmpx9kdyr7z1wcif2cwyh0g"; + sha256 = "1z7bag6zb2vwi7wp2bkdkmk7swkj6zfnbsnc949qq0wfsgw94fr3"; type = "gem"; }; - version = "2.4.1"; + version = "2.5.0"; }; dalli = { groups = [ "default" ]; @@ -71,6 +82,16 @@ }; version = "3.2.8"; }; + date = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0kz6mc4b9m49iaans6cbx031j9y7ldghpi5fzsdh0n3ixwa8w9mz"; + type = "gem"; + }; + version = "3.4.1"; + }; drb = { groups = [ "default" ]; platforms = [ ]; @@ -150,10 +171,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "09871c4hd7s5ws1wl4gs7js1k2wlby6v947m2bbzg43pnld044lh"; + sha256 = "0l87r9jg06nsh24gwwd1jdnxb1zq89ffybnxab0dd90nfcf0ysw5"; type = "gem"; }; - version = "1.0.4"; + version = "1.1.0"; }; faraday-net_http = { groups = [ "default" ]; @@ -247,20 +268,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0k31wcgnvcvd14snz0pfqj976zv6drfsnq6x8acz10fiyms9l8nw"; + sha256 = "03sx3ahz1v5kbqjwxj48msw3maplpp2iyzs22l4jrzrqh4zmgfnf"; type = "gem"; }; - version = "1.14.6"; + version = "1.14.7"; }; logger = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s"; + sha256 = "05s008w9vy7is3njblmavrbdzyrwwc1fsziffdr58w9pwqj8sqfx"; type = "gem"; }; - version = "1.6.1"; + version = "1.6.6"; }; lru_redux = { groups = [ "default" ]; @@ -272,15 +293,25 @@ }; version = "1.1.0"; }; + mini_portile2 = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0x8asxl83msn815lwmb2d7q5p29p7drhjv5va0byhk60v9n16iwf"; + type = "gem"; + }; + version = "2.8.8"; + }; minitest = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1n1akmc6bibkbxkzm1p1wmfb4n9vv397knkgz0ffykb3h1d7kdix"; + sha256 = "0mn7q9yzrwinvfvkyjiz548a4rmcwbmz2fn9nyzh4j1snin6q6rr"; type = "gem"; }; - version = "5.25.1"; + version = "5.25.5"; }; multipart-post = { groups = [ "default" ]; @@ -308,21 +339,24 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "017nbw87dpr4wyk81cgj8kxkxqgsgblrkxnmmadc77cg9gflrfal"; + sha256 = "1a9www524fl1ykspznz54i0phfqya4x45hqaz67in9dvw1lfwpfr"; type = "gem"; }; - version = "2.7.3"; + version = "2.7.4"; }; psych = { - dependencies = [ "stringio" ]; + dependencies = [ + "date" + "stringio" + ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0s5383m6004q76xm3lb732bp4sjzb6mxb6rbgn129gy2izsj4wrk"; + sha256 = "1vjrx3yd596zzi42dcaq5xw7hil1921r769dlbz08iniaawlp9c4"; type = "gem"; }; - version = "5.1.2"; + version = "5.2.3"; }; puma = { dependencies = [ "nio4r" ]; @@ -330,20 +364,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0gml1rixrfb0naciq3mrnqkpcvm9ahgps1c04hzxh4b801f69914"; + sha256 = "11xd3207k5rl6bz0qxhcb3zcr941rhx7ig2f19gxxmdk7s3hcp7j"; type = "gem"; }; - version = "6.4.3"; + version = "6.6.0"; }; rack = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0ax778fsfvlhj7c11n0d1wdcb8bxvkb190a9lha5d91biwzyx9g4"; + sha256 = "1yzhcwvfkrlb8l79w24yjclv636jn6rnznp95shmssk934bi1vnc"; type = "gem"; }; - version = "2.2.10"; + version = "2.2.13"; }; rack-protection = { dependencies = [ @@ -374,10 +408,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1phv6kh417vkanhssbjr960c0gfqvf8z7d3d9fd2yvd41q64bw4q"; + sha256 = "1cd0iriqfsf1z91qg271sm88xjnfd92b832z49p1nd542ka96lfc"; type = "gem"; }; - version = "0.3.1"; + version = "0.4.1"; }; sequel = { dependencies = [ "bigdecimal" ]; @@ -385,10 +419,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "04jjv63wvvi9qfkpfsrv6w74liiqk4cd1qnlk7ja7i2waci9hlzx"; + sha256 = "1s5qhylirrmfbjhdjdfqaiksjlaqmgixl25sxd8znq8dqwqlrydz"; type = "gem"; }; - version = "5.85.0"; + version = "5.90.0"; }; server_health_check = { groups = [ "default" ]; @@ -428,11 +462,12 @@ version = "3.2.0"; }; sqlite3 = { + dependencies = [ "mini_portile2" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "sha256-+nf2PHCVSPRtTptrtFzaUqo4gaoSzIWZETJ1jolocBw="; + sha256 = "073hd24qwx9j26cqbk0jma0kiajjv9fb8swv9rnz8j4mf0ygcxzs"; type = "gem"; }; version = "1.7.3"; @@ -442,10 +477,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "07mfqb40b2wh53k33h91zva78f9zwcdnl85jiq74wnaw2wa6wiak"; + sha256 = "1j1mgvrgkxhadi6nb6pz1kcff7gsb5aivj1vfhsia4ssa5hj9adw"; type = "gem"; }; - version = "3.1.1"; + version = "3.1.5"; }; terminal-table = { dependencies = [ "unicode-display_width" ]; @@ -473,10 +508,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0kds7wkxmb038cwp6ravnwn8k65ixc68wpm8j5jx5bhx8ndg4x6z"; + sha256 = "0szpapi229v3scrvw1pgy0vpjm7z3qlf58m1198kxn70cs278g96"; type = "gem"; }; - version = "2.4.0"; + version = "2.6.0"; }; tzinfo = { dependencies = [ "concurrent-ruby" ]; From abdf76a4b0fab0ccf5650e0173cd842a102de6dd Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 20 Mar 2025 12:18:25 -0500 Subject: [PATCH 16/33] mailcatcher: 0.9.0 -> 0.10.0 --- pkgs/development/web/mailcatcher/Gemfile.lock | 139 +--- pkgs/development/web/mailcatcher/gemset.nix | 650 ++---------------- 2 files changed, 81 insertions(+), 708 deletions(-) diff --git a/pkgs/development/web/mailcatcher/Gemfile.lock b/pkgs/development/web/mailcatcher/Gemfile.lock index 9f931928053d..8df2c9589ec2 100644 --- a/pkgs/development/web/mailcatcher/Gemfile.lock +++ b/pkgs/development/web/mailcatcher/Gemfile.lock @@ -1,143 +1,62 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.4) - public_suffix (>= 2.0.2, < 6.0) - capybara (3.39.2) - addressable - matrix - mini_mime (>= 0.1.3) - nokogiri (~> 1.8) - rack (>= 1.6.0) - rack-test (>= 0.6.3) - regexp_parser (>= 1.5, < 3.0) - xpath (~> 3.2) - capybara-screenshot (1.0.26) - capybara (>= 1.0, < 4) - launchy - chunky_png (1.4.0) - coffee-script (2.4.1) - coffee-script-source - execjs - coffee-script-source (1.12.2) - compass (1.0.3) - chunky_png (~> 1.2) - compass-core (~> 1.0.2) - compass-import-once (~> 1.0.5) - rb-fsevent (>= 0.9.3) - rb-inotify (>= 0.9) - sass (>= 3.3.13, < 3.5) - compass-core (1.0.3) - multi_json (~> 1.0) - sass (>= 3.3.0, < 3.5) - compass-import-once (1.0.5) - sass (>= 3.2, < 3.5) - concurrent-ruby (1.2.2) + base64 (0.2.0) daemons (1.4.1) - date (3.3.3) - diff-lcs (1.5.0) + date (3.4.1) eventmachine (1.2.7) - execjs (2.8.1) faye-websocket (0.11.3) eventmachine (>= 0.12.0) websocket-driver (>= 0.5.1) - ffi (1.15.5) - launchy (2.5.2) - addressable (~> 2.8) mail (2.8.1) mini_mime (>= 0.1.1) net-imap net-pop net-smtp - mailcatcher (0.9.0) - eventmachine (= 1.2.7) + mailcatcher (0.10.0) + eventmachine (~> 1.0) faye-websocket (~> 0.11.1) mail (~> 2.3) net-smtp - rack (~> 1.5) - sinatra (~> 1.2) + rack (~> 2.2) + sinatra (~> 3.2) sqlite3 (~> 1.3) thin (~> 1.8) - matrix (0.4.2) - mini_mime (1.1.2) - mini_portile2 (2.8.4) - multi_json (1.15.0) - net-imap (0.3.7) + mini_mime (1.1.5) + mini_portile2 (2.8.8) + mustermann (3.0.3) + ruby2_keywords (~> 0.0.1) + net-imap (0.5.6) date net-protocol net-pop (0.1.2) net-protocol - net-protocol (0.2.1) + net-protocol (0.2.2) timeout - net-smtp (0.3.3) + net-smtp (0.5.1) net-protocol - nokogiri (1.16.0) - mini_portile2 (~> 2.8.2) - racc (~> 1.4) - psych (5.1.0) - stringio - public_suffix (5.0.3) - racc (1.7.1) - rack (1.6.13) - rack-protection (1.5.5) - rack - rack-test (2.1.0) - rack (>= 1.3) - rake (13.0.6) - rb-fsevent (0.11.2) - rb-inotify (0.10.1) - ffi (~> 1.0) - rdoc (6.5.0) - psych (>= 4.0.0) - regexp_parser (2.8.1) - rexml (3.2.6) - rspec (3.12.0) - rspec-core (~> 3.12.0) - rspec-expectations (~> 3.12.0) - rspec-mocks (~> 3.12.0) - rspec-core (3.12.2) - rspec-support (~> 3.12.0) - rspec-expectations (3.12.3) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-mocks (3.12.6) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-support (3.12.1) - rubyzip (2.3.2) - sass (3.4.25) - selenium-webdriver (4.9.0) - rexml (~> 3.2, >= 3.2.5) - rubyzip (>= 1.2.2, < 3.0) - websocket (~> 1.0) - sinatra (1.4.8) - rack (~> 1.5) - rack-protection (~> 1.4) - tilt (>= 1.3, < 3) - sprockets (3.7.2) - concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-helpers (1.4.0) - sprockets (>= 2.2) - sprockets-sass (2.0.0.beta2) - sprockets (>= 2.0, < 4.0) - sqlite3 (1.6.3) + rack (2.2.13) + rack-protection (3.2.0) + base64 (>= 0.1.0) + rack (~> 2.2, >= 2.2.4) + ruby2_keywords (0.0.5) + sinatra (3.2.0) + mustermann (~> 3.0) + rack (~> 2.2, >= 2.2.4) + rack-protection (= 3.2.0) + tilt (~> 2.0) + sqlite3 (1.7.3) mini_portile2 (~> 2.8.0) - stringio (3.0.7) thin (1.8.2) daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) - tilt (2.2.0) - timeout (0.4.0) - uglifier (4.2.0) - execjs (>= 0.3.0, < 3) - websocket (1.2.9) - websocket-driver (0.7.6) + tilt (2.6.0) + timeout (0.4.3) + websocket-driver (0.7.7) + base64 websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - xpath (3.2.0) - nokogiri (~> 1.8) PLATFORMS ruby @@ -146,4 +65,4 @@ DEPENDENCIES mailcatcher BUNDLED WITH - 2.1.4 + 2.6.2 diff --git a/pkgs/development/web/mailcatcher/gemset.nix b/pkgs/development/web/mailcatcher/gemset.nix index 34021359d865..d9f6eb17e4a6 100644 --- a/pkgs/development/web/mailcatcher/gemset.nix +++ b/pkgs/development/web/mailcatcher/gemset.nix @@ -1,153 +1,13 @@ { - addressable = { - dependencies = [ "public_suffix" ]; - groups = [ - "default" - "development" - ]; + base64 = { + groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "15s8van7r2ad3dq6i03l3z4hqnvxcq75a3h72kxvf9an53sqma20"; + sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g"; type = "gem"; }; - version = "2.8.4"; - }; - capybara = { - dependencies = [ - "addressable" - "matrix" - "mini_mime" - "nokogiri" - "rack" - "rack-test" - "regexp_parser" - "xpath" - ]; - groups = [ "development" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "114qm5f5vhwaaw9rj1h2lcamh46zl13v1m18jiw68zl961gwmw6n"; - type = "gem"; - }; - version = "3.39.2"; - }; - capybara-screenshot = { - dependencies = [ - "capybara" - "launchy" - ]; - groups = [ "development" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0xqc7hdiw1ql42mklpfvqd2pyfsxmy55cpx0h9y0jlkpl1q96sw1"; - type = "gem"; - }; - version = "1.0.26"; - }; - chunky_png = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1znw5x86hmm9vfhidwdsijz8m38pqgmv98l9ryilvky0aldv7mc9"; - type = "gem"; - }; - version = "1.4.0"; - }; - coffee-script = { - dependencies = [ - "coffee-script-source" - "execjs" - ]; - groups = [ "development" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0rc7scyk7mnpfxqv5yy4y5q1hx3i7q3ahplcp4bq2g5r24g2izl2"; - type = "gem"; - }; - version = "2.4.1"; - }; - coffee-script-source = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1907v9q1zcqmmyqzhzych5l7qifgls2rlbnbhy5vzyr7i7yicaz1"; - type = "gem"; - }; - version = "1.12.2"; - }; - compass = { - dependencies = [ - "chunky_png" - "compass-core" - "compass-import-once" - "rb-fsevent" - "rb-inotify" - "sass" - ]; - groups = [ "development" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0lfi83w8z75czr0pf0rmj9hda22082h3cmvczl8r1ma9agf88y2c"; - type = "gem"; - }; - version = "1.0.3"; - }; - compass-core = { - dependencies = [ - "multi_json" - "sass" - ]; - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0yaspqwdmzwdcqviclbs3blq7an16pysrfzylz8q1gxmmd6bpj3a"; - type = "gem"; - }; - version = "1.0.3"; - }; - compass-import-once = { - dependencies = [ "sass" ]; - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0bn7gwbfz7jvvdd0qdfqlx67fcb83gyvxqc7dr9fhcnks3z8z5rq"; - type = "gem"; - }; - version = "1.0.5"; - }; - concurrent-ruby = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q"; - type = "gem"; - }; - version = "1.2.2"; + version = "0.2.0"; }; daemons = { groups = [ "default" ]; @@ -164,23 +24,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "03skfikihpx37rc27vr3hwrb057gxnmdzxhmzd4bf4jpkl0r55w1"; + sha256 = "0kz6mc4b9m49iaans6cbx031j9y7ldghpi5fzsdh0n3ixwa8w9mz"; type = "gem"; }; - version = "3.3.3"; - }; - diff-lcs = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0rwvjahnp7cpmracd8x732rjgnilqv2sx7d1gfrysslc3h039fa9"; - type = "gem"; - }; - version = "1.5.0"; + version = "3.4.1"; }; eventmachine = { groups = [ "default" ]; @@ -192,19 +39,6 @@ }; version = "1.2.7"; }; - execjs = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "121h6af4i6wr3wxvv84y53jcyw2sk71j5wsncm6wq6yqrwcrk4vd"; - type = "gem"; - }; - version = "2.8.1"; - }; faye-websocket = { dependencies = [ "eventmachine" @@ -219,33 +53,6 @@ }; version = "0.11.3"; }; - ffi = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg"; - type = "gem"; - }; - version = "1.15.5"; - }; - launchy = { - dependencies = [ "addressable" ]; - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "06r43899384das2bkbrpsdxsafyyqa94il7111053idfalb4984a"; - type = "gem"; - }; - version = "2.5.2"; - }; mail = { dependencies = [ "mini_mime" @@ -277,62 +84,41 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "003d2a6i97syw67jxrjq0p4xm19p9cfqnbmsg4b1c3mdb5c78rfz"; + sha256 = "0383smildpjh0zrcq38x1y1ka6rkpdwjnlx4ng9dlyv8hkhnz6zm"; type = "gem"; }; - version = "0.9.0"; - }; - matrix = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1h2cgkpzkh3dd0flnnwfq6f3nl2b1zff9lvqz8xs853ssv5kq23i"; - type = "gem"; - }; - version = "0.4.2"; + version = "0.10.0"; }; mini_mime = { - groups = [ - "default" - "development" - ]; + groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0lbim375gw2dk6383qirz13hgdmxlan0vc5da2l072j3qw6fqjm5"; + sha256 = "1vycif7pjzkr29mfk4dlqv3disc5dn0va04lkwajlpr1wkibg0c6"; type = "gem"; }; - version = "1.1.2"; + version = "1.1.5"; }; mini_portile2 = { - groups = [ - "default" - "development" - ]; + groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "02mj8mpd6ck5gpcnsimx5brzggw5h5mmmpq2djdypfq16wcw82qq"; + sha256 = "0x8asxl83msn815lwmb2d7q5p29p7drhjv5va0byhk60v9n16iwf"; type = "gem"; }; - version = "2.8.4"; + version = "2.8.8"; }; - multi_json = { - groups = [ - "default" - "development" - ]; + mustermann = { + dependencies = [ "ruby2_keywords" ]; + groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z"; + sha256 = "123ycmq6pkivv29bqbv79jv2cs04xakzd0fz1lalgvfs5nxfky6i"; type = "gem"; }; - version = "1.15.0"; + version = "3.0.3"; }; net-imap = { dependencies = [ @@ -343,10 +129,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0lf7wqg7czhaj51qsnmn28j7jmcxhkh3m28rl1cjrqsgjxhwj7r3"; + sha256 = "1rgva7p9gvns2ndnqpw503mbd36i2skkggv0c0h192k8xr481phy"; type = "gem"; }; - version = "0.3.7"; + version = "0.5.6"; }; net-pop = { dependencies = [ "net-protocol" ]; @@ -365,10 +151,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0dxckrlw4q1lcn3qg4mimmjazmg9bma5gllv72f8js3p36fb3b91"; + sha256 = "1a32l4x73hz200cm587bc29q8q9az278syw3x6fkc9d1lv5y0wxa"; type = "gem"; }; - version = "0.2.1"; + version = "0.2.2"; }; net-smtp = { dependencies = [ "net-protocol" ]; @@ -376,296 +162,48 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1c6md06hm5bf6rv53sk54dl2vg038pg8kglwv3rayx0vk2mdql9x"; + sha256 = "0dh7nzjp0fiaqq1jz90nv4nxhc2w359d7c199gmzq965cfps15pd"; type = "gem"; }; - version = "0.3.3"; - }; - nokogiri = { - dependencies = [ - "mini_portile2" - "racc" - ]; - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1l8b0i24h4irivyhwy9xmkjbggw86cxkzkiqdqg0jpcp9qc8h4rl"; - type = "gem"; - }; - version = "1.16.0"; - }; - psych = { - dependencies = [ "stringio" ]; - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1msambb54r3d1sg6smyj4k2pj9h9lz8jq4jamip7ivcyv32a85vz"; - type = "gem"; - }; - version = "5.1.0"; - }; - public_suffix = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0n9j7mczl15r3kwqrah09cxj8hxdfawiqxa60kga2bmxl9flfz9k"; - type = "gem"; - }; - version = "5.0.3"; - }; - racc = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "11v3l46mwnlzlc371wr3x6yylpgafgwdf0q7hc7c1lzx6r414r5g"; - type = "gem"; - }; - version = "1.7.1"; + version = "0.5.1"; }; rack = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0wr1f3g9rc9i8svfxa9cijajl1661d817s56b2w7rd572zwn0zi0"; - type = "gem"; - }; - version = "1.6.13"; - }; - rack-protection = { - dependencies = [ "rack" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0my0wlw4a5l3hs79jkx2xzv7djhajgf8d28k8ai1ddlnxxb0v7ss"; + sha256 = "1yzhcwvfkrlb8l79w24yjclv636jn6rnznp95shmssk934bi1vnc"; type = "gem"; }; - version = "1.5.5"; + version = "2.2.13"; }; - rack-test = { - dependencies = [ "rack" ]; - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1ysx29gk9k14a14zsp5a8czys140wacvp91fja8xcja0j1hzqq8c"; - type = "gem"; - }; - version = "2.1.0"; - }; - rake = { - groups = [ "development" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w"; - type = "gem"; - }; - version = "13.0.6"; - }; - rb-fsevent = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1zmf31rnpm8553lqwibvv3kkx0v7majm1f341xbxc0bk5sbhp423"; - type = "gem"; - }; - version = "0.11.2"; - }; - rb-inotify = { - dependencies = [ "ffi" ]; - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1jm76h8f8hji38z3ggf4bzi8vps6p7sagxn3ab57qc0xyga64005"; - type = "gem"; - }; - version = "0.10.1"; - }; - rdoc = { - dependencies = [ "psych" ]; - groups = [ "development" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "05r2cxscapr9saqjw8dlp89as7jvc2mlz1h5kssrmkbz105qmfcm"; - type = "gem"; - }; - version = "6.5.0"; - }; - regexp_parser = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "136br91alxdwh1s85z912dwz23qlhm212vy6i3wkinz3z8mkxxl3"; - type = "gem"; - }; - version = "2.8.1"; - }; - rexml = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; - type = "gem"; - }; - version = "3.2.6"; - }; - rspec = { + rack-protection = { dependencies = [ - "rspec-core" - "rspec-expectations" - "rspec-mocks" + "base64" + "rack" ]; - groups = [ "development" ]; + groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "171rc90vcgjl8p1bdrqa92ymrj8a87qf6w20x05xq29mljcigi6c"; + sha256 = "1zzvivmdb4dkscc58i3gmcyrnypynsjwp6xgc4ylarlhqmzvlx1w"; type = "gem"; }; - version = "3.12.0"; + version = "3.2.0"; }; - rspec-core = { - dependencies = [ "rspec-support" ]; - groups = [ - "default" - "development" - ]; + ruby2_keywords = { + groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0l95bnjxdabrn79hwdhn2q1n7mn26pj7y1w5660v5qi81x458nqm"; + sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz"; type = "gem"; }; - version = "3.12.2"; - }; - rspec-expectations = { - dependencies = [ - "diff-lcs" - "rspec-support" - ]; - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "05j44jfqlv7j2rpxb5vqzf9hfv7w8ba46wwgxwcwd8p0wzi1hg89"; - type = "gem"; - }; - version = "3.12.3"; - }; - rspec-mocks = { - dependencies = [ - "diff-lcs" - "rspec-support" - ]; - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1gq7gviwpck7fhp4y5ibljljvxgjklza18j62qf6zkm2icaa8lfy"; - type = "gem"; - }; - version = "3.12.6"; - }; - rspec-support = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1ky86j3ksi26ng9ybd7j0qsdf1lpr8mzrmn98yy9gzv801fvhsgr"; - type = "gem"; - }; - version = "3.12.1"; - }; - rubyzip = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz"; - type = "gem"; - }; - version = "2.3.2"; - }; - sass = { - groups = [ "development" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0kfpcwh8dgw4lc81qglkvjl73689jy3g7196zkxm4fpskg1p5lkw"; - type = "gem"; - }; - version = "3.4.25"; - }; - selenium-webdriver = { - dependencies = [ - "rexml" - "rubyzip" - "websocket" - ]; - groups = [ "development" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1kxnv3ywssagv2q453hasrrrvsv68d5f3ccm33pyacdji88w8pqg"; - type = "gem"; - }; - version = "4.9.0"; + version = "0.0.5"; }; sinatra = { dependencies = [ + "mustermann" "rack" "rack-protection" "tilt" @@ -674,46 +212,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0byxzl7rx3ki0xd7aiv1x8mbah7hzd8f81l65nq8857kmgzj1jqq"; + sha256 = "01wq20aqk5kfggq3wagx5xr1cz0x08lg6dxbk9yhd1sf0d6pywkf"; type = "gem"; }; - version = "1.4.8"; - }; - sprockets = { - dependencies = [ - "concurrent-ruby" - "rack" - ]; - groups = [ "development" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "182jw5a0fbqah5w9jancvfmjbk88h8bxdbwnl4d3q809rpxdg8ay"; - type = "gem"; - }; - version = "3.7.2"; - }; - sprockets-helpers = { - dependencies = [ "sprockets" ]; - groups = [ "development" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0513ma356g05lsskhsb363263177h6ccmp475il0p69y18his2ij"; - type = "gem"; - }; - version = "1.4.0"; - }; - sprockets-sass = { - dependencies = [ "sprockets" ]; - groups = [ "development" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "02g153dhzmrlik5dd9kyq0rvr2xjm3fwx8rm7apqfrykc47aizqr"; - type = "gem"; - }; - version = "2.0.0.beta2"; + version = "3.2.0"; }; sqlite3 = { dependencies = [ "mini_portile2" ]; @@ -721,23 +223,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0h95kr5529qv786mfk8r2jjdsdi6v7v3k3dpz69mrcc9i0vpdd37"; + sha256 = "073hd24qwx9j26cqbk0jma0kiajjv9fb8swv9rnz8j4mf0ygcxzs"; type = "gem"; }; - version = "1.6.3"; - }; - stringio = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0557v4z7996cgqw7i9197848mymv02krads93dn9lyqa5d7xd0dn"; - type = "gem"; - }; - version = "3.0.7"; + version = "1.7.3"; }; thin = { dependencies = [ @@ -759,55 +248,34 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0bmjgbv8158klwp2r3klxjwaj93nh1sbl4xvj9wsha0ic478avz7"; + sha256 = "0szpapi229v3scrvw1pgy0vpjm7z3qlf58m1198kxn70cs278g96"; type = "gem"; }; - version = "2.2.0"; + version = "2.6.0"; }; timeout = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1d9cvm0f4zdpwa795v3zv4973y5zk59j7s1x3yn90jjrhcz1yvfd"; + sha256 = "03p31w5ghqfsbz5mcjzvwgkw3h9lbvbknqvrdliy8pxmn9wz02cm"; type = "gem"; }; - version = "0.4.0"; - }; - uglifier = { - dependencies = [ "execjs" ]; - groups = [ "development" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0wgh7bzy68vhv9v68061519dd8samcy8sazzz0w3k8kqpy3g4s5f"; - type = "gem"; - }; - version = "4.2.0"; - }; - websocket = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0dib6p55sl606qb4vpwrvj5wh881kk4aqn2zpfapf8ckx7g14jw8"; - type = "gem"; - }; - version = "1.2.9"; + version = "0.4.3"; }; websocket-driver = { - dependencies = [ "websocket-extensions" ]; + dependencies = [ + "base64" + "websocket-extensions" + ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1nyh873w4lvahcl8kzbjfca26656d5c6z3md4sbqg5y1gfz0157n"; + sha256 = "1d26l4qn55ivzahbc7fwc4k4z3j7wzym05i9n77i4mslrpr9jv85"; type = "gem"; }; - version = "0.7.6"; + version = "0.7.7"; }; websocket-extensions = { groups = [ "default" ]; @@ -819,18 +287,4 @@ }; version = "0.1.5"; }; - xpath = { - dependencies = [ "nokogiri" ]; - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0bh8lk9hvlpn7vmi6h4hkcwjzvs2y0cmkk3yjjdr8fxvj6fsgzbd"; - type = "gem"; - }; - version = "3.2.0"; - }; } From 93353a23e5ea2af15cbea276319d47836dcb8361 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Thu, 27 Feb 2025 22:13:18 +0100 Subject: [PATCH 17/33] rstudio: 2024.04.2+764 -> 2024.12.1+563 --- .../editors/rstudio/boost-1.86.patch | 79 +++++++++++++++- pkgs/applications/editors/rstudio/default.nix | 32 ++++--- .../editors/rstudio/fix-darwin.patch | 42 +++++---- .../editors/rstudio/fix-resources-path.patch | 19 ---- .../rstudio/ignore-etc-os-release.patch | 16 ++-- .../rstudio/update-nan-and-node-abi.patch | 94 +++++++++---------- 6 files changed, 170 insertions(+), 112 deletions(-) delete mode 100644 pkgs/applications/editors/rstudio/fix-resources-path.patch diff --git a/pkgs/applications/editors/rstudio/boost-1.86.patch b/pkgs/applications/editors/rstudio/boost-1.86.patch index ca7ca648e5b6..058eaf42e96d 100644 --- a/pkgs/applications/editors/rstudio/boost-1.86.patch +++ b/pkgs/applications/editors/rstudio/boost-1.86.patch @@ -1,8 +1,8 @@ diff --git a/src/cpp/core/json/JsonRpc.cpp b/src/cpp/core/json/JsonRpc.cpp -index d034ffecd7..4b08486517 100644 +index d034ffe..4b08486 100644 --- a/src/cpp/core/json/JsonRpc.cpp +++ b/src/cpp/core/json/JsonRpc.cpp -@@ -193,7 +193,7 @@ +@@ -193,7 +193,7 @@ void JsonRpcResponse::setAfterResponse( bool JsonRpcResponse::hasAfterResponse() const { @@ -11,3 +11,78 @@ index d034ffecd7..4b08486517 100644 } +diff --git a/src/cpp/session/modules/rmarkdown/NotebookExec.cpp b/src/cpp/session/modules/rmarkdown/NotebookExec.cpp +index 5631a1f..0e3030b 100644 +--- a/src/cpp/session/modules/rmarkdown/NotebookExec.cpp ++++ b/src/cpp/session/modules/rmarkdown/NotebookExec.cpp +@@ -193,7 +193,7 @@ void ChunkExecContext::connect() + + // leave an execution lock in this folder so it won't be moved if the notebook + // is saved while executing +- auto lock = make_unique( ++ auto lock = rstudio::core::make_unique( + FileLock::createDefault(), + outputPath_.completePath(kExecutionLock)); + locks_.push_back(std::move(lock)); +@@ -204,7 +204,7 @@ void ChunkExecContext::connect() + initializeOutput(); + + // capture conditions +- auto pConditionCapture = make_unique(); ++ auto pConditionCapture = rstudio::core::make_unique(); + pConditionCapture->connect(); + captures_.push_back(std::move(pConditionCapture)); + connections_.push_back(events().onCondition.connect( +@@ -234,7 +234,7 @@ void ChunkExecContext::connect() + boost::bind(&ChunkExecContext::onFileOutput, this, _1, _2, + _3, ChunkOutputPlot, _4))); + +- auto pPlotCapture = make_unique(); ++ auto pPlotCapture = rstudio::core::make_unique(); + if (figWidth > 0 || figHeight > 0) + { + // user specified plot size, use it +@@ -261,7 +261,7 @@ void ChunkExecContext::connect() + boost::bind(&ChunkExecContext::onFileOutput, this, _1, _2, _3, + ChunkOutputHtml, 0))); + +- auto pHtmlCapture = make_unique(); ++ auto pHtmlCapture = rstudio::core::make_unique(); + error = pHtmlCapture->connectHtmlCapture( + outputPath_, + outputPath_.getParent().completePath(kChunkLibDir), +@@ -316,14 +316,14 @@ void ChunkExecContext::connect() + prevCharWidth_ = r::options::getOptionWidth(); + r::options::setOptionWidth(charWidth_); + +- auto pDirCapture = make_unique(); ++ auto pDirCapture = rstudio::core::make_unique(); + error = pDirCapture->connectDir(docId_, workingDir_); + if (error) + LOG_ERROR(error); + captures_.push_back(std::move(pDirCapture)); + + // begin capturing errors +- auto pErrorCapture = make_unique(); ++ auto pErrorCapture = rstudio::core::make_unique(); + pErrorCapture->connect(); + captures_.push_back(std::move(pErrorCapture)); + +@@ -341,7 +341,7 @@ void ChunkExecContext::connect() + boost::bind(&ChunkExecContext::onFileOutput, this, _1, _2, _3, + ChunkOutputData, 0))); + +- auto pDataCapture = make_unique(); ++ auto pDataCapture = rstudio::core::make_unique(); + error = pDataCapture->connectDataCapture( + outputPath_, + options_.mergedOptions()); +@@ -661,7 +661,7 @@ void ChunkExecContext::initializeOutput() + + // leave an execution lock in this folder so it won't be moved if the notebook + // is saved while executing +- auto lock = make_unique( ++ auto lock = rstudio::core::make_unique( + FileLock::createDefault(), + outputPath.completePath(kExecutionLock)); + locks_.push_back(std::move(lock)); diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 84e07c350a9f..5b8f9b09db74 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -55,13 +55,12 @@ let hash = "sha256-J7SZK/9q3HcXTD7WFHxvh++ttuCd89Vc4SEBrUEU0AI="; }; - # Ideally, rev should match the rstudio release name. - # e.g. release/rstudio-mountain-hydrangea + # rev should ideally be the last commit of the release/rstudio-[codename] branch quartoSrc = fetchFromGitHub { owner = "quarto-dev"; repo = "quarto"; - rev = "bb264a572c6331d46abcf087748c021d815c55d7"; - hash = "sha256-lZnZvioztbBWWa6H177X6rRrrgACx2gMjVFDgNup93g="; + rev = "7d1582d06250216d18696145879415e473a2ae4d"; + hash = "sha256-AaE9EDT3tJieI403QGxAf+A/PEw1rmUdhdpy4WNf40o="; }; hunspellDictionaries = lib.filter lib.isDerivation (lib.unique (lib.attrValues hunspellDicts)); @@ -83,7 +82,7 @@ let in stdenv.mkDerivation rec { pname = "RStudio"; - version = "2024.04.2+764"; + version = "2024.12.1+563"; RSTUDIO_VERSION_MAJOR = lib.versions.major version; RSTUDIO_VERSION_MINOR = lib.versions.minor version; @@ -94,7 +93,7 @@ stdenv.mkDerivation rec { owner = "rstudio"; repo = "rstudio"; tag = "v${version}"; - hash = "sha256-j258eW1MYQrB6kkpjyolXdNuwQ3zSWv9so4q0QLsZuw="; + hash = "sha256-fguomJHs7FBffYfMlgWgnjLWK3uDZYX4Ip4asKZ8XVQ="; }; nativeBuildInputs = @@ -159,7 +158,6 @@ stdenv.mkDerivation rec { libclang = lib.getLib llvmPackages.libclang; }) - ./fix-resources-path.patch ./ignore-etc-os-release.patch ./dont-yarn-install.patch ./boost-1.86.patch @@ -174,13 +172,13 @@ stdenv.mkDerivation rec { --replace-fail "''${CMAKE_INSTALL_PREFIX}/rstudio" "rstudio" # set install path of freedesktop files - substituteInPlace src/{cpp,node}/desktop/CMakeLists.txt \ + substituteInPlace src/node/desktop/CMakeLists.txt \ --replace-fail "/usr/share" "$out/share" ''; yarnOfflineCache = fetchYarnDeps { yarnLock = quartoSrc + "/yarn.lock"; - hash = "sha256-Qw8O1Jzl2EO0DEF3Jrw/cIT9t22zs3jyKgDA5XZbuGA="; + hash = "sha256-48Q2MkfzXZSL3ly56WSjRVwU3fgRD8xivQobStBkk6Y="; }; dontYarnInstallDeps = true; # will call manually in preConfigure @@ -190,12 +188,14 @@ stdenv.mkDerivation rec { # don't build native modules with node headers npmFlags = [ "--ignore-scripts" ]; + makeCacheWritable = true; + npmDeps = fetchNpmDeps { name = "rstudio-${version}-npm-deps"; inherit src; patches = [ ./update-nan-and-node-abi.patch ]; postPatch = "cd ${npmRoot}"; - hash = "sha256-CtHCN4sWeHNDd59TV/TgTC4d6h7X1Cl4E/aJkAfRk7g="; + hash = "sha256-9VHse+nxr5A1EWuszQ6cnJAMqYiHFqHQ4OJ/TJq+XoI="; }; env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; @@ -226,11 +226,13 @@ stdenv.mkDerivation rec { mkdir -p dependencies/common/node # node used by cmake - # version in CMakeGlobals.txt (RSTUDIO_NODE_VERSION) - ln -s ${nodejs} dependencies/common/node/18.18.2 + # version in cmake/globals.cmake (RSTUDIO_NODE_VERSION) + ln -s ${nodejs} dependencies/common/node/20.15.1 + # node used at runtime - # version in CMakeGlobals.txt (RSTUDIO_INSTALLED_NODE_VERSION) - ln -s ${nodejs} dependencies/common/node/18.20.3 + # version in cmake/globals.cmake (RSTUDIO_INSTALLED_NODE_VERSION) + # upstream uses the -patched suffix for the runtime node directory + ln -s ${nodejs} dependencies/common/node/20.15.1-patched ${lib.optionalString (!server) '' pushd $npmRoot @@ -256,7 +258,7 @@ stdenv.mkDerivation rec { rm -r electron-dist # force @electron/packager to use our electron instead of downloading it - substituteInPlace node_modules/@electron/packager/src/index.js \ + substituteInPlace node_modules/@electron/packager/dist/packager.js \ --replace-fail "await this.getElectronZipPath(downloadOpts)" "'$(pwd)/electron.zip'" # Work around known nan issue for electron_33 and above diff --git a/pkgs/applications/editors/rstudio/fix-darwin.patch b/pkgs/applications/editors/rstudio/fix-darwin.patch index fd66f1574f5a..d07ecc6e5056 100644 --- a/pkgs/applications/editors/rstudio/fix-darwin.patch +++ b/pkgs/applications/editors/rstudio/fix-darwin.patch @@ -1,8 +1,8 @@ -diff --git a/CMakeGlobals.txt b/CMakeGlobals.txt -index 8868c44..19b2fa0 100644 ---- a/CMakeGlobals.txt -+++ b/CMakeGlobals.txt -@@ -345,6 +345,7 @@ if (APPLE) +diff --git a/cmake/globals.cmake b/cmake/globals.cmake +index e53248b..c705d67 100644 +--- a/cmake/globals.cmake ++++ b/cmake/globals.cmake +@@ -334,6 +334,7 @@ if (APPLE) set(RSTUDIO_INSTALL_SUPPORTING RStudio.app/Contents/Resources/app) # handles Quarto share when not stored alongside bin set(RSTUDIO_INSTALL_RESOURCES RStudio.app/Contents/Resources) @@ -11,10 +11,10 @@ index 8868c44..19b2fa0 100644 set(RSTUDIO_INSTALL_BIN RStudio.app/Contents/MacOS) set(RSTUDIO_INSTALL_SUPPORTING RStudio.app/Contents/Resources) diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt -index b47f04f..928165d 100644 +index 76f3acb..2910cee 100644 --- a/src/cpp/CMakeLists.txt +++ b/src/cpp/CMakeLists.txt -@@ -240,7 +240,7 @@ endif() +@@ -243,7 +243,7 @@ endif() # determine whether we should statically link boost. we always do this # unless we are building a non-packaged build on linux (in which case # boost dynamic libraries are presumed to be installed on the system ldpath) @@ -23,7 +23,7 @@ index b47f04f..928165d 100644 set(Boost_USE_STATIC_LIBS ON) endif() -@@ -475,7 +475,7 @@ endif() +@@ -483,7 +483,7 @@ endif() # find SOCI libraries if(UNIX) @@ -33,7 +33,7 @@ index b47f04f..928165d 100644 find_library(SOCI_SQLITE_LIB NAMES "libsoci_sqlite3.a" "soci_sqlite3" REQUIRED) if(RSTUDIO_PRO_BUILD) diff --git a/src/node/CMakeNodeTools.txt b/src/node/CMakeNodeTools.txt -index 43f7f63..8a35a16 100644 +index 40ae0f3..756fd5f 100644 --- a/src/node/CMakeNodeTools.txt +++ b/src/node/CMakeNodeTools.txt @@ -27,17 +27,7 @@ endif() @@ -56,10 +56,10 @@ index 43f7f63..8a35a16 100644 # Detect node.js, npm, and npx; use versions supplied by the dependency scripts find_program(NODEJS diff --git a/src/node/desktop/CMakeLists.txt b/src/node/desktop/CMakeLists.txt -index 2f4d929..9769143 100644 +index 35438fd..f9b1951 100644 --- a/src/node/desktop/CMakeLists.txt +++ b/src/node/desktop/CMakeLists.txt -@@ -119,22 +119,9 @@ if (APPLE) +@@ -122,22 +122,9 @@ if (APPLE) # configure Info.plist configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist) @@ -84,7 +84,7 @@ index 2f4d929..9769143 100644 set(ELECTRON_BUILD_DIR "${ELECTRON_SOURCE_DIR}" CACHE INTERNAL "") endif() -@@ -230,16 +217,21 @@ if(WIN32) +@@ -233,16 +220,21 @@ if(WIN32) PROGRAMS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} DESTINATION "${RSTUDIO_INSTALL_BIN}") @@ -110,16 +110,18 @@ index 2f4d929..9769143 100644 OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE diff --git a/src/node/desktop/src/main/session-launcher.ts b/src/node/desktop/src/main/session-launcher.ts -index 615ca1e..a9c1624 100644 +index 94f56ac..fe7d5d9 100644 --- a/src/node/desktop/src/main/session-launcher.ts +++ b/src/node/desktop/src/main/session-launcher.ts -@@ -89,27 +89,9 @@ function launchProcess(absPath: FilePath, argList: string[]): ChildProcess { +@@ -91,29 +91,9 @@ function launchProcess(absPath: FilePath, argList: string[]): ChildProcess { // DYLD_INSERT_LIBRARIES to inject the library we wish to use const rHome = new FilePath(getenv('R_HOME')); const rLib = rHome.completePath('lib/libR.dylib'); - const dyldArgs = [ -- '-e', `DYLD_INSERT_LIBRARIES=${rLib.getAbsolutePath()}`, -- '-e', `DYLD_FALLBACK_LIBRARY_PATH=${dyldFallbackLibraryPath}` +- '-e', +- `DYLD_INSERT_LIBRARIES=${rLib.getAbsolutePath()}`, +- '-e', +- `DYLD_FALLBACK_LIBRARY_PATH=${dyldFallbackLibraryPath}`, - ]; - - // launch via /usr/bin/arch, so we can control whether the OS requests @@ -144,7 +146,7 @@ index 615ca1e..a9c1624 100644 } const rsessionOptions = new LogOptions('rsession'); -@@ -542,22 +524,6 @@ export class SessionLauncher { +@@ -566,22 +546,6 @@ export class SessionLauncher { } } @@ -164,6 +166,6 @@ index 615ca1e..a9c1624 100644 - } - } - - const sessionProc = launchProcess(this.sessionPath, argList); - sessionProc.on('error', (err) => { - // Unable to start rsession (at all) + // if we're running automation tests, set that up now + if (app.commandLine.hasSwitch('run-automation')) { + argList.push('--run-automation'); diff --git a/pkgs/applications/editors/rstudio/fix-resources-path.patch b/pkgs/applications/editors/rstudio/fix-resources-path.patch deleted file mode 100644 index 24f8b3cb51b9..000000000000 --- a/pkgs/applications/editors/rstudio/fix-resources-path.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/src/cpp/desktop/DesktopOptions.cpp -+++ b/src/cpp/desktop/DesktopOptions.cpp -@@ -499,15 +499,9 @@ - { - if (resourcesPath_.isEmpty()) - { --#ifdef RSTUDIO_PACKAGE_BUILD - // release configuration: the 'resources' folder is - // part of the supporting files folder -- resourcesPath_ = supportingFilePath().completePath("resources"); --#else -- // developer configuration: the 'resources' folder is -- // a sibling of the RStudio executable -- resourcesPath_ = scriptsPath().completePath("resources"); --#endif -+ resourcesPath_ = supportingFilePath().completePath("resources"); - } - - return resourcesPath_; diff --git a/pkgs/applications/editors/rstudio/ignore-etc-os-release.patch b/pkgs/applications/editors/rstudio/ignore-etc-os-release.patch index 7c67edd16fcb..5dfa009546e2 100644 --- a/pkgs/applications/editors/rstudio/ignore-etc-os-release.patch +++ b/pkgs/applications/editors/rstudio/ignore-etc-os-release.patch @@ -1,10 +1,10 @@ -diff --git a/CMakeGlobals.txt b/CMakeGlobals.txt -index 5f96ffb..3f15687 100644 ---- a/CMakeGlobals.txt -+++ b/CMakeGlobals.txt -@@ -29,11 +29,6 @@ endif() - get_filename_component(ROOT_SRC_DIR ${CMAKE_CURRENT_LIST_FILE} PATH) - set(CMAKE_MODULE_PATH "${ROOT_SRC_DIR}/cmake/modules/") +diff --git a/cmake/globals.cmake b/cmake/globals.cmake +index e53248b..179e3cb 100644 +--- a/cmake/globals.cmake ++++ b/cmake/globals.cmake +@@ -23,11 +23,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL Linux) + set(LINUX TRUE CACHE INTERNAL "") + endif() -# read /etc/os-release -if(LINUX) @@ -45,7 +45,7 @@ index 81a9e1f..0000000 -endforeach() - diff --git a/package/linux/CMakeLists.txt b/package/linux/CMakeLists.txt -index 5d5c35e..a94f8fc 100644 +index 2c55ebe..7ac9651 100644 --- a/package/linux/CMakeLists.txt +++ b/package/linux/CMakeLists.txt @@ -16,7 +16,7 @@ diff --git a/pkgs/applications/editors/rstudio/update-nan-and-node-abi.patch b/pkgs/applications/editors/rstudio/update-nan-and-node-abi.patch index 7ba18405769a..bdb62dfa8a5e 100644 --- a/pkgs/applications/editors/rstudio/update-nan-and-node-abi.patch +++ b/pkgs/applications/editors/rstudio/update-nan-and-node-abi.patch @@ -1,72 +1,70 @@ diff --git a/src/node/desktop/package-lock.json b/src/node/desktop/package-lock.json -index 01c11edaf4..5e356470be 100644 +index a210521..9543abb 100644 --- a/src/node/desktop/package-lock.json +++ b/src/node/desktop/package-lock.json -@@ -19,7 +19,7 @@ +@@ -18,7 +18,7 @@ "line-reader": "0.4.0", "lodash.debounce": "4.0.8", - "net-ipc": "2.1.0", -- "node-abi": "3.52.0", -+ "node-abi": "^3.71.0", - "node-addon-api": "7.0.0", + "net-ipc": "2.2.0", +- "node-abi": "3.71.0", ++ "node-abi": "^3.74.0", + "node-addon-api": "8.3.0", "node-system-fonts": "1.0.1", "properties-reader": "2.3.0", -@@ -63,7 +63,7 @@ - "json-schema-to-typescript": "13.1.1", - "lint-staged": "15.2.0", - "mocha": "10.2.0", -- "nan": "2.18.0", -+ "nan": "^2.22.0", - "node-loader": "2.0.0", - "nyc": "15.1.0", - "prettier": "3.1.1", -@@ -9768,9 +9768,10 @@ +@@ -56,7 +56,7 @@ + "json-schema-to-typescript": "14.1.0", + "lint-staged": "15.2.10", + "mocha": "10.8.2", +- "nan": "2.22.0", ++ "nan": "^2.22.1", + "node-loader": "2.1.0", + "nyc": "17.1.0", + "prettier": "3.3.3", +@@ -9538,9 +9538,9 @@ } }, "node_modules/nan": { -- "version": "2.18.0", -- "resolved": "https://registry.npmjs.org/nan/-/nan-2.18.0.tgz", -- "integrity": "sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w==" -+ "version": "2.22.0", -+ "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.0.tgz", -+ "integrity": "sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==", -+ "license": "MIT" +- "version": "2.22.0", +- "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.0.tgz", +- "integrity": "sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==", ++ "version": "2.22.1", ++ "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.1.tgz", ++ "integrity": "sha512-pfRR4ZcNTSm2ZFHaztuvbICf+hyiG6ecA06SfAxoPmuHjvMu0KUIae7Y8GyVkbBqeEIidsmXeYooWIX9+qjfRQ==", + "license": "MIT" }, "node_modules/nanoid": { - "version": "3.3.3", -@@ -9863,9 +9864,10 @@ +@@ -9667,9 +9667,9 @@ } }, "node_modules/node-abi": { -- "version": "3.52.0", -- "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.52.0.tgz", -- "integrity": "sha512-JJ98b02z16ILv7859irtXn4oUaFWADtvkzy2c0IAatNVX2Mc9Yoh8z6hZInn3QwvMEYhHuQloYi+TTQy67SIdQ==", -+ "version": "3.71.0", -+ "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.71.0.tgz", -+ "integrity": "sha512-SZ40vRiy/+wRTf21hxkkEjPJZpARzUMVcJoQse2EF8qkUWbbO2z7vd5oA/H6bVH6SZQ5STGcu0KRDS7biNRfxw==", -+ "license": "MIT", +- "version": "3.71.0", +- "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.71.0.tgz", +- "integrity": "sha512-SZ40vRiy/+wRTf21hxkkEjPJZpARzUMVcJoQse2EF8qkUWbbO2z7vd5oA/H6bVH6SZQ5STGcu0KRDS7biNRfxw==", ++ "version": "3.74.0", ++ "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.74.0.tgz", ++ "integrity": "sha512-c5XK0MjkGBrQPGYG24GBADZud0NCbznxNx0ZkS+ebUTrmV1qTDxPxSL8zEAPURXSbLRWVexxmP4986BziahL5w==", + "license": "MIT", "dependencies": { "semver": "^7.3.5" - }, diff --git a/src/node/desktop/package.json b/src/node/desktop/package.json -index 059c39f9d7..ca9066077d 100644 +index 8b8ef47..287d879 100644 --- a/src/node/desktop/package.json +++ b/src/node/desktop/package.json -@@ -59,7 +59,7 @@ - "json-schema-to-typescript": "13.1.1", - "lint-staged": "15.2.0", - "mocha": "10.2.0", -- "nan": "2.18.0", -+ "nan": "^2.22.0", - "node-loader": "2.0.0", - "nyc": "15.1.0", - "process": "0.11.10", -@@ -83,7 +83,7 @@ +@@ -54,7 +54,7 @@ + "json-schema-to-typescript": "14.1.0", + "lint-staged": "15.2.10", + "mocha": "10.8.2", +- "nan": "2.22.0", ++ "nan": "^2.22.1", + "node-loader": "2.1.0", + "nyc": "17.1.0", + "prettier": "3.3.3", +@@ -76,7 +76,7 @@ "line-reader": "0.4.0", "lodash.debounce": "4.0.8", - "net-ipc": "2.1.0", -- "node-abi": "3.52.0", -+ "node-abi": "^3.71.0", - "node-addon-api": "7.0.0", + "net-ipc": "2.2.0", +- "node-abi": "3.71.0", ++ "node-abi": "^3.74.0", + "node-addon-api": "8.3.0", "node-system-fonts": "1.0.1", "properties-reader": "2.3.0", From 2cb3ba6e30a564111b2bf5ac767c60a629b9eeb4 Mon Sep 17 00:00:00 2001 From: ian bierlich Date: Thu, 20 Mar 2025 22:25:00 +0100 Subject: [PATCH 18/33] masterpdfeditor: fix dependency for digitally signing documents --- pkgs/by-name/ma/masterpdfeditor/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/ma/masterpdfeditor/package.nix b/pkgs/by-name/ma/masterpdfeditor/package.nix index 719eeb88bda6..878352ee473c 100644 --- a/pkgs/by-name/ma/masterpdfeditor/package.nix +++ b/pkgs/by-name/ma/masterpdfeditor/package.nix @@ -65,6 +65,10 @@ stdenv.mkDerivation rec { runHook postInstall ''; + preFixup = '' + patchelf $out/opt/masterpdfeditor/masterpdfeditor5 --add-needed libsmime3.so + ''; + meta = { description = "Master PDF Editor"; homepage = "https://code-industry.net/free-pdf-editor/"; From 42b6fd19a71186e66532f7588c28fd3c48187f64 Mon Sep 17 00:00:00 2001 From: Eduwardo Horibe Date: Thu, 20 Mar 2025 21:39:22 -0300 Subject: [PATCH 19/33] orca-slicer: v2.3.0-rc -> v2.3.0 https://github.com/SoftFever/OrcaSlicer/releases/tag/v2.3.0 --- pkgs/by-name/or/orca-slicer/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/or/orca-slicer/package.nix b/pkgs/by-name/or/orca-slicer/package.nix index 337f314302b1..223064576721 100644 --- a/pkgs/by-name/or/orca-slicer/package.nix +++ b/pkgs/by-name/or/orca-slicer/package.nix @@ -57,13 +57,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "orca-slicer"; - version = "v2.3.0-rc"; + version = "v2.3.0"; src = fetchFromGitHub { owner = "SoftFever"; repo = "OrcaSlicer"; tag = finalAttrs.version; - hash = "sha256-obQUn5vG+6g8PYK9Xatt3QiBPNWskoTs2Byi+1xabBk="; + hash = "sha256-MEa57jFBJkqwoAkqI7wXOn1X1zxgLQt3SNeanfD88kU="; }; nativeBuildInputs = [ From 2c52c72f08387de9f5d6536ab1e0d038ea1997c5 Mon Sep 17 00:00:00 2001 From: Henri Rosten Date: Fri, 21 Mar 2025 11:42:20 +0200 Subject: [PATCH 20/33] sbomnix: 1.7.1 -> 1.7.2 Signed-off-by: Henri Rosten --- pkgs/tools/security/sbomnix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/sbomnix/default.nix b/pkgs/tools/security/sbomnix/default.nix index d55375519195..d9a71e4f631d 100644 --- a/pkgs/tools/security/sbomnix/default.nix +++ b/pkgs/tools/security/sbomnix/default.nix @@ -28,14 +28,14 @@ python.pkgs.buildPythonApplication rec { pname = "sbomnix"; - version = "1.7.1"; + version = "1.7.2"; pyproject = true; src = fetchFromGitHub { owner = "tiiuae"; repo = "sbomnix"; tag = "v${version}"; - hash = "sha256-LMrsJnJXmn+rneIslAaoIpwOyPVIVjOyu49O+7J/nIs="; + hash = "sha256-Vtrxpb6nTTR5a9sFi1NrhEflhPOwv1gt6i7DnggJwMs="; # Remove documentation as it contains references to nix store postFetch = '' From c6eb71e54ea4d3616e975e565b967ffaf10a9b50 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Fri, 21 Mar 2025 11:18:38 -0500 Subject: [PATCH 21/33] terraspace: Update ruby gems to fix vulnerability --- pkgs/by-name/te/terraspace/Gemfile.lock | 81 ++++++------ pkgs/by-name/te/terraspace/gemset.nix | 161 ++++++++++++++---------- 2 files changed, 135 insertions(+), 107 deletions(-) diff --git a/pkgs/by-name/te/terraspace/Gemfile.lock b/pkgs/by-name/te/terraspace/Gemfile.lock index aa9e1600198b..74b43d988b07 100644 --- a/pkgs/by-name/te/terraspace/Gemfile.lock +++ b/pkgs/by-name/te/terraspace/Gemfile.lock @@ -1,43 +1,48 @@ GEM remote: https://rubygems.org/ specs: - activesupport (7.1.3.4) + activesupport (8.0.2) base64 + benchmark (>= 0.3) bigdecimal - concurrent-ruby (~> 1.0, >= 1.0.2) + concurrent-ruby (~> 1.0, >= 1.3.1) connection_pool (>= 2.2.5) drb i18n (>= 1.6, < 2) + logger (>= 1.4.2) minitest (>= 5.1) - mutex_m - tzinfo (~> 2.0) - aws-eventstream (1.3.0) - aws-partitions (1.956.0) - aws-sdk-core (3.201.1) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) + uri (>= 0.13.1) + aws-eventstream (1.3.2) + aws-partitions (1.1071.0) + aws-sdk-core (3.220.2) aws-eventstream (~> 1, >= 1.3.0) - aws-partitions (~> 1, >= 1.651.0) - aws-sigv4 (~> 1.8) + aws-partitions (~> 1, >= 1.992.0) + aws-sigv4 (~> 1.9) + base64 jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.88.0) - aws-sdk-core (~> 3, >= 3.201.0) + aws-sdk-kms (1.99.0) + aws-sdk-core (~> 3, >= 3.216.0) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.156.0) - aws-sdk-core (~> 3, >= 3.201.0) + aws-sdk-s3 (1.182.0) + aws-sdk-core (~> 3, >= 3.216.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) - aws-sigv4 (1.8.0) + aws-sigv4 (1.11.0) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) - bigdecimal (3.1.8) + benchmark (0.4.0) + bigdecimal (3.1.9) cli-format (0.6.1) activesupport text-table zeitwerk - concurrent-ruby (1.3.3) - connection_pool (2.4.1) + concurrent-ruby (1.3.5) + connection_pool (2.5.0) deep_merge (1.2.2) - diff-lcs (1.5.1) - dotenv (3.1.2) + diff-lcs (1.6.0) + dotenv (3.1.7) drb (2.2.1) dsl_evaluator (0.3.2) activesupport @@ -50,47 +55,46 @@ GEM graph (2.11.1) hcl_parser (0.2.2) rhcl - i18n (1.14.5) + i18n (1.14.7) concurrent-ruby (~> 1.0) jmespath (1.6.2) + logger (1.6.6) memoist (0.16.2) - mini_portile2 (2.8.7) - minitest (5.24.1) - mutex_m (0.2.0) - nokogiri (1.16.6) + mini_portile2 (2.8.8) + minitest (5.25.5) + nokogiri (1.18.5) mini_portile2 (~> 2.8.2) racc (~> 1.4) - racc (1.8.0) + racc (1.8.1) rainbow (3.1.1) - render_me_pretty (0.9.0) + render_me_pretty (1.0.0) activesupport rainbow tilt - rexml (3.3.2) - strscan + rexml (3.4.1) rhcl (0.1.0) deep_merge rspec (3.13.0) rspec-core (~> 3.13.0) rspec-expectations (~> 3.13.0) rspec-mocks (~> 3.13.0) - rspec-core (3.13.0) + rspec-core (3.13.3) rspec-support (~> 3.13.0) - rspec-expectations (3.13.1) + rspec-expectations (3.13.3) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-mocks (3.13.1) + rspec-mocks (3.13.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-support (3.13.1) + rspec-support (3.13.2) rspec-terraspace (0.3.3) activesupport memoist rainbow rspec zeitwerk - rubyzip (2.3.2) - strscan (3.1.0) + rubyzip (2.4.1) + securerandom (0.4.1) terraspace (2.2.17) activesupport bundler @@ -122,12 +126,13 @@ GEM thor zeitwerk text-table (1.2.4) - thor (1.3.1) - tilt (2.4.0) + thor (1.3.2) + tilt (2.6.0) tty-tree (0.4.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - zeitwerk (2.6.16) + uri (1.0.3) + zeitwerk (2.7.2) zip_folder (0.1.0) rubyzip @@ -138,4 +143,4 @@ DEPENDENCIES terraspace BUNDLED WITH - 2.5.11 + 2.6.2 diff --git a/pkgs/by-name/te/terraspace/gemset.nix b/pkgs/by-name/te/terraspace/gemset.nix index 1a78094d37a5..6a07f9ece302 100644 --- a/pkgs/by-name/te/terraspace/gemset.nix +++ b/pkgs/by-name/te/terraspace/gemset.nix @@ -2,59 +2,63 @@ activesupport = { dependencies = [ "base64" + "benchmark" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" + "logger" "minitest" - "mutex_m" + "securerandom" "tzinfo" + "uri" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0283wk1zxb76lg79dk501kcf5xy9h25qiw15m86s4nrfv11vqns5"; + sha256 = "0pm40y64wfc50a9sj87kxvil2102rmpdcbv82zf0r40vlgdwsrc5"; type = "gem"; }; - version = "7.1.3.4"; + version = "8.0.2"; }; aws-eventstream = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0gvdg4yx4p9av2glmp7vsxhs0n8fj1ga9kq2xdb8f95j7b04qhzi"; + sha256 = "1mvjjn8vh1c3nhibmjj9qcwxagj6m9yy961wblfqdmvhr9aklb3y"; type = "gem"; }; - version = "1.3.0"; + version = "1.3.2"; }; aws-partitions = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "03zb6x4x68y91gywsyi4a6hxy4pdyng8mnxwd858bhjfymml8kkf"; + sha256 = "1qlygf2bg086hr5cpyg8hh0jwvx4xvkh8v09maxdj7xqplzplhg7"; type = "gem"; }; - version = "1.956.0"; + version = "1.1071.0"; }; aws-sdk-core = { dependencies = [ "aws-eventstream" "aws-partitions" "aws-sigv4" + "base64" "jmespath" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1ihl7iwndl3jjy89sh427wf8mdb7ii76bsjf6fkxq9ha30nz4f3g"; + sha256 = "0qydjik09i110rxpkz4g8kfq5n10x0fwp2cwpb9zw44kprzwvcmn"; type = "gem"; }; - version = "3.201.1"; + version = "3.220.2"; }; aws-sdk-kms = { dependencies = [ @@ -65,10 +69,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "02g3l3lcyddqncrwjxgawxl33p2p715k1gbrdlgyiv0yvy88sn0k"; + sha256 = "1a3mh89kfh6flqxw48wfv9wfwkj2zxazw096mqm56wnnzz1jyads"; type = "gem"; }; - version = "1.88.0"; + version = "1.99.0"; }; aws-sdk-s3 = { dependencies = [ @@ -80,10 +84,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0ika0xmmrkc7jiwdi5gqia5wywkcbw1nal2dhl436dkh38fxl0lk"; + sha256 = "03a55dbihv6xvgfwhx0f35rwc7q3rr0555vfpxlwpdjw75wkbz6h"; type = "gem"; }; - version = "1.156.0"; + version = "1.182.0"; }; aws-sigv4 = { dependencies = [ "aws-eventstream" ]; @@ -91,10 +95,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1g3w27wzjy4si6kp49w10as6ml6g6zl3xrfqs5ikpfciidv9kpc4"; + sha256 = "1nx1il781qg58nwjkkdn9fw741cjjnixfsh389234qm8j5lpka2h"; type = "gem"; }; - version = "1.8.0"; + version = "1.11.0"; }; base64 = { groups = [ "default" ]; @@ -106,15 +110,25 @@ }; version = "0.2.0"; }; + benchmark = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0jl71qcgamm96dzyqk695j24qszhcc7liw74qc83fpjljp2gh4hg"; + type = "gem"; + }; + version = "0.4.0"; + }; bigdecimal = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1gi7zqgmqwi5lizggs1jhc3zlwaqayy9rx2ah80sxy24bbnng558"; + sha256 = "1k6qzammv9r6b2cw3siasaik18i6wjc5m0gw5nfdc6jj64h79z1g"; type = "gem"; }; - version = "3.1.8"; + version = "3.1.9"; }; cli-format = { dependencies = [ @@ -136,20 +150,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0skwdasxq7mnlcccn6aqabl7n9r3jd7k19ryzlzzip64cn4x572g"; + sha256 = "1ipbrgvf0pp6zxdk5ascp6i29aybz2bx9wdrlchjmpx6mhvkwfw1"; type = "gem"; }; - version = "1.3.3"; + version = "1.3.5"; }; connection_pool = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1x32mcpm2cl5492kd6lbjbaf17qsssmpx9kdyr7z1wcif2cwyh0g"; + sha256 = "1z7bag6zb2vwi7wp2bkdkmk7swkj6zfnbsnc949qq0wfsgw94fr3"; type = "gem"; }; - version = "2.4.1"; + version = "2.5.0"; }; deep_merge = { groups = [ "default" ]; @@ -166,20 +180,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1znxccz83m4xgpd239nyqxlifdb7m8rlfayk6s259186nkgj6ci7"; + sha256 = "0bnss89lcm3b1k3xcjd35grxqz5q040d12imd73qybwnfarggrx1"; type = "gem"; }; - version = "1.5.1"; + version = "1.6.0"; }; dotenv = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0y24jabiz4cf9ni9vi4j8sab8b5phpf2mpw3981r0r94l4m6q0q8"; + sha256 = "1wrw6fm0s38cd6h55w79bkvjhcj2zfkargjpws4kilkmhr3xyw66"; type = "gem"; }; - version = "3.1.2"; + version = "3.1.7"; }; drb = { groups = [ "default" ]; @@ -255,10 +269,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1ffix518y7976qih9k1lgnc17i3v6yrlh0a3mckpxdb4wc2vrp16"; + sha256 = "03sx3ahz1v5kbqjwxj48msw3maplpp2iyzs22l4jrzrqh4zmgfnf"; type = "gem"; }; - version = "1.14.5"; + version = "1.14.7"; }; jmespath = { groups = [ "default" ]; @@ -270,6 +284,16 @@ }; version = "1.6.2"; }; + logger = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "05s008w9vy7is3njblmavrbdzyrwwc1fsziffdr58w9pwqj8sqfx"; + type = "gem"; + }; + version = "1.6.6"; + }; memoist = { groups = [ "default" ]; platforms = [ ]; @@ -285,30 +309,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1q1f2sdw3y3y9mnym9dhjgsjr72sq975cfg5c4yx7gwv8nmzbvhk"; + sha256 = "0x8asxl83msn815lwmb2d7q5p29p7drhjv5va0byhk60v9n16iwf"; type = "gem"; }; - version = "2.8.7"; + version = "2.8.8"; }; minitest = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0jj629q3vw5yn90q4di4dyb87pil4a8qfm2srhgy5nc8j2n33v1i"; + sha256 = "0mn7q9yzrwinvfvkyjiz548a4rmcwbmz2fn9nyzh4j1snin6q6rr"; type = "gem"; }; - version = "5.24.1"; - }; - mutex_m = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1ma093ayps1m92q845hmpk0dmadicvifkbf05rpq9pifhin0rvxn"; - type = "gem"; - }; - version = "0.2.0"; + version = "5.25.5"; }; nokogiri = { dependencies = [ @@ -319,20 +333,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1vz1ychq2fhfqjgqdrx8bqkaxg5dzcgwnah00m57ydylczfy8pwk"; + sha256 = "1p1nl5gqs56wlv2gwzdj0px3dw018ywpkg14a4s23b0qjkdgi9n8"; type = "gem"; }; - version = "1.16.6"; + version = "1.18.5"; }; racc = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "021s7maw0c4d9a6s07vbmllrzqsj2sgmrwimlh8ffkvwqdjrld09"; + sha256 = "0byn0c9nkahsl93y9ln5bysq4j31q8xkf2ws42swighxd4lnjzsa"; type = "gem"; }; - version = "1.8.0"; + version = "1.8.1"; }; rainbow = { groups = [ "default" ]; @@ -354,21 +368,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0qx9pv0irkcqjx9f0mh5s6d9m0fck329bp845ryic34nsvnbsp4k"; + sha256 = "012hbn90kwc2byqyibkadqjbhbwvz3fa8n3iw190p031f5cm75n2"; type = "gem"; }; - version = "0.9.0"; + version = "1.0.0"; }; rexml = { - dependencies = [ "strscan" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0zr5qpa8lampaqzhdcjcvyqnrqcjl7439mqjlkjz43wdhmpnh4s5"; + sha256 = "1jmbf6lf7pcyacpb939xjjpn1f84c3nw83dy3p1lwjx0l2ljfif7"; type = "gem"; }; - version = "3.3.2"; + version = "3.4.1"; }; rhcl = { dependencies = [ "deep_merge" ]; @@ -402,10 +415,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0k252n7s80bvjvpskgfm285a3djjjqyjcarlh3aq7a4dx2s94xsm"; + sha256 = "1r6zbis0hhbik1ck8kh58qb37d1qwij1x1d2fy4jxkzryh3na4r5"; type = "gem"; }; - version = "3.13.0"; + version = "3.13.3"; }; rspec-expectations = { dependencies = [ @@ -416,10 +429,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0022nxs9gqfhx35n4klibig770n0j31pnkd8anz00yvrvkdghk41"; + sha256 = "0n3cyrhsa75x5wwvskrrqk56jbjgdi2q1zx0irllf0chkgsmlsqf"; type = "gem"; }; - version = "3.13.1"; + version = "3.13.3"; }; rspec-mocks = { dependencies = [ @@ -430,20 +443,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0f3vgp43hajw716vmgjv6f4ar6f97zf50snny6y3fy9kkj4qjw88"; + sha256 = "1vxxkb2sf2b36d8ca2nq84kjf85fz4x7wqcvb8r6a5hfxxfk69r3"; type = "gem"; }; - version = "3.13.1"; + version = "3.13.2"; }; rspec-support = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "03z7gpqz5xkw9rf53835pa8a9vgj4lic54rnix9vfwmp2m7pv1s8"; + sha256 = "1v6v6xvxcpkrrsrv7v1xgf7sl0d71vcfz1cnrjflpf6r7x3a58yf"; type = "gem"; }; - version = "3.13.1"; + version = "3.13.2"; }; rspec-terraspace = { dependencies = [ @@ -467,20 +480,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz"; + sha256 = "05an0wz87vkmqwcwyh5rjiaavydfn5f4q1lixcsqkphzvj7chxw5"; type = "gem"; }; - version = "2.3.2"; + version = "2.4.1"; }; - strscan = { + securerandom = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0mamrl7pxacbc79ny5hzmakc9grbjysm3yy6119ppgsg44fsif01"; + sha256 = "1cd0iriqfsf1z91qg271sm88xjnfd92b832z49p1nd542ka96lfc"; type = "gem"; }; - version = "3.1.0"; + version = "0.4.1"; }; terraspace = { dependencies = [ @@ -548,20 +561,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1vq1fjp45az9hfp6fxljhdrkv75cvbab1jfrwcw738pnsiqk8zps"; + sha256 = "1nmymd86a0vb39pzj2cwv57avdrl6pl3lf5bsz58q594kqxjkw7f"; type = "gem"; }; - version = "1.3.1"; + version = "1.3.2"; }; tilt = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0kds7wkxmb038cwp6ravnwn8k65ixc68wpm8j5jx5bhx8ndg4x6z"; + sha256 = "0szpapi229v3scrvw1pgy0vpjm7z3qlf58m1198kxn70cs278g96"; type = "gem"; }; - version = "2.4.0"; + version = "2.6.0"; }; tty-tree = { groups = [ "default" ]; @@ -584,15 +597,25 @@ }; version = "2.0.6"; }; + uri = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "04bhfvc25b07jaiaf62yrach7khhr5jlr5bx6nygg8pf11329wp9"; + type = "gem"; + }; + version = "1.0.3"; + }; zeitwerk = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "08cfb35232p9s1r4jqv8wacv38vxh699mgbr9y03ga89gx9lipqp"; + sha256 = "0ws6rpyj0y9iadjg1890dwnnbjfdbzxsv6r48zbj7f8yn5y0cbl4"; type = "gem"; }; - version = "2.6.16"; + version = "2.7.2"; }; zip_folder = { dependencies = [ "rubyzip" ]; From 2b2b22886c3d4dcac3b6b7224a7aad6883090baa Mon Sep 17 00:00:00 2001 From: phaer Date: Fri, 21 Mar 2025 17:27:36 +0100 Subject: [PATCH 22/33] plotext: 5.2.8 -> 5.3.2 --- pkgs/development/python-modules/plotext/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plotext/default.nix b/pkgs/development/python-modules/plotext/default.nix index 614a09e78bed..a7bd0e2e7568 100644 --- a/pkgs/development/python-modules/plotext/default.nix +++ b/pkgs/development/python-modules/plotext/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "plotext"; - version = "5.2.8"; + version = "5.3.2"; format = "setuptools"; src = fetchFromGitHub { owner = "piccolomo"; repo = pname; tag = version; - hash = "sha256-V7N7p5RxLKYLmJeojikYJ/tT/IpVGzG3ZPVvUisDAVs="; + hash = "sha256-4cuStXnZFTlOoBp9w+LrTZavCWEaQdZMY4apGNKvBXE="; }; # Package does not have a conventional test suite that can be run with either From 12578c0db660b6ddc0ba646cf369ad660d316d74 Mon Sep 17 00:00:00 2001 From: Toboi Date: Fri, 21 Mar 2025 21:59:41 +0100 Subject: [PATCH 23/33] raysession: 0.14.3 -> 0.14.4 --- pkgs/applications/audio/raysession/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/raysession/default.nix b/pkgs/applications/audio/raysession/default.nix index cc7c0e0d5a74..fba0126b2819 100644 --- a/pkgs/applications/audio/raysession/default.nix +++ b/pkgs/applications/audio/raysession/default.nix @@ -12,11 +12,11 @@ buildPythonApplication rec { pname = "raysession"; - version = "0.14.3"; + version = "0.14.4"; src = fetchurl { url = "https://github.com/Houston4444/RaySession/releases/download/v${version}/RaySession-${version}-source.tar.gz"; - sha256 = "sha256-3+g1zdjGkxNEpyuKuxzhr2p9gkEFjYAso4fPedbjmlY="; + sha256 = "sha256-cr9kqZdqY6Wq+RkzwYxNrb/PLFREKUgWeVNILVUkc7A="; }; postPatch = '' From 90d5da07f356a6b3d42acbd13c2b292cc245daab Mon Sep 17 00:00:00 2001 From: Toboi Date: Fri, 21 Mar 2025 22:04:06 +0100 Subject: [PATCH 24/33] raysession: fix ray-jackpatch ray-jackpatch.py loads main_loop.py, but that was being replaced with a wrapper, which couldn't be loaded correctly by python. Removing the executable bit avoids it getting wrapped. --- pkgs/applications/audio/raysession/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/audio/raysession/default.nix b/pkgs/applications/audio/raysession/default.nix index fba0126b2819..38c6b78d72d7 100644 --- a/pkgs/applications/audio/raysession/default.nix +++ b/pkgs/applications/audio/raysession/default.nix @@ -24,6 +24,7 @@ buildPythonApplication rec { substituteInPlace Makefile --replace '$(DESTDIR)/' '$(DESTDIR)$(PREFIX)/' # Do not wrap an importable module with a shell script. chmod -x src/daemon/desktops_memory.py + chmod -x src/clients/jackpatch/main_loop.py ''; format = "other"; From 5d7dcd162f9e8b85f7b624a7b501cee65326f7bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Fri, 21 Mar 2025 22:48:39 +0100 Subject: [PATCH 25/33] ltex-ls-plus: add jvm option --- pkgs/by-name/lt/ltex-ls-plus/package.nix | 25 ++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/lt/ltex-ls-plus/package.nix b/pkgs/by-name/lt/ltex-ls-plus/package.nix index 08b74fc4b9da..6bb2bccebb20 100644 --- a/pkgs/by-name/lt/ltex-ls-plus/package.nix +++ b/pkgs/by-name/lt/ltex-ls-plus/package.nix @@ -4,6 +4,7 @@ fetchurl, makeBinaryWrapper, jre_headless, + jvmOptions ? [ ], }: stdenvNoCC.mkDerivation rec { @@ -17,18 +18,22 @@ stdenvNoCC.mkDerivation rec { nativeBuildInputs = [ makeBinaryWrapper ]; - installPhase = '' - runHook preInstall + installPhase = + let + java_opts = lib.optionalString (jvmOptions != [ ]) ''--set JAVA_OPTS "${toString jvmOptions}"''; + in + '' + runHook preInstall - mkdir -p $out - cp -rfv bin/ lib/ $out - rm -fv $out/bin/.lsp-cli.json $out/bin/*.bat - for file in $out/bin/{ltex-ls-plus,ltex-cli-plus}; do - wrapProgram $file --set JAVA_HOME "${jre_headless}" - done + mkdir -p $out + cp -rfv bin/ lib/ $out + rm -fv $out/bin/.lsp-cli.json $out/bin/*.bat + for file in $out/bin/{ltex-ls-plus,ltex-cli-plus}; do + wrapProgram $file --set JAVA_HOME "${jre_headless}" ${java_opts} + done - runHook postInstall - ''; + runHook postInstall + ''; meta = let From e2e69dc0cf8b75298e2edbf4af9ab7df2359c7ce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 22 Mar 2025 00:33:49 +0000 Subject: [PATCH 26/33] orchard: 0.28.3 -> 0.29.0 --- pkgs/by-name/or/orchard/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/or/orchard/package.nix b/pkgs/by-name/or/orchard/package.nix index 15e16e971f97..b6ff0c60258d 100644 --- a/pkgs/by-name/or/orchard/package.nix +++ b/pkgs/by-name/or/orchard/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "orchard"; - version = "0.28.3"; + version = "0.29.0"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = version; - hash = "sha256-blXxINsM793iH7X38J+Mrqf/WKnSRoS48yP4r3Dllow="; + hash = "sha256-Dw1cD+ScWS8GmBx04ZC8cxsgvq/6J9JC6SaOUeM6nZg="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -24,7 +24,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-OimkH34coQLhJlJd3BGBFE9L/TQtU4tJbTl0zwmQh3w="; + vendorHash = "sha256-X2TiE1ANze5EQemTnSlMVwi6ttNWEINXlgq1czLWWeQ="; nativeBuildInputs = [ installShellFiles ]; From dc2a1d8f342bcfeab06282d1741a979b807ea589 Mon Sep 17 00:00:00 2001 From: codgician <15964984+codgician@users.noreply.github.com> Date: Sat, 22 Mar 2025 14:07:10 +0800 Subject: [PATCH 27/33] blobfuse: add update script --- pkgs/by-name/bl/blobfuse/package.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/bl/blobfuse/package.nix b/pkgs/by-name/bl/blobfuse/package.nix index 6ec9a31943f4..9372ee41de8e 100644 --- a/pkgs/by-name/bl/blobfuse/package.nix +++ b/pkgs/by-name/bl/blobfuse/package.nix @@ -5,6 +5,7 @@ fuse3, testers, blobfuse, + nix-update-script, }: let @@ -28,7 +29,10 @@ buildGoModule { # https://github.com/NixOS/nixpkgs/pull/201196/files#diff-e669dbe391f8856f4564f26023fe147a7b720aeefe6869ab7a218f02a8247302R20 doCheck = false; - passthru.tests.version = testers.testVersion { package = blobfuse; }; + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { package = blobfuse; }; + }; meta = with lib; { description = "Mount an Azure Blob storage as filesystem through FUSE"; From d7b0058f42df98e3fdffbc80de4ff27e95df0035 Mon Sep 17 00:00:00 2001 From: codgician <15964984+codgician@users.noreply.github.com> Date: Sat, 22 Mar 2025 06:08:43 +0000 Subject: [PATCH 28/33] blobfuse: 2.1.2 -> 2.4.1 --- pkgs/by-name/bl/blobfuse/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bl/blobfuse/package.nix b/pkgs/by-name/bl/blobfuse/package.nix index 9372ee41de8e..2eb2b7b2a6ba 100644 --- a/pkgs/by-name/bl/blobfuse/package.nix +++ b/pkgs/by-name/bl/blobfuse/package.nix @@ -9,19 +9,19 @@ }: let - version = "2.1.2"; + version = "2.4.1"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-storage-fuse"; rev = "blobfuse2-${version}"; - sha256 = "sha256-KzpD+6g1WwviydYE0v5pSH35zC41MrPlk5MitwAIgnE="; + sha256 = "sha256-QCrBsEh8o4GblCWNcJssm9c6uSQYVs+qrdzfmI9l278="; }; in buildGoModule { pname = "blobfuse"; inherit version src; - vendorHash = "sha256-+Z+mkTs/8qCtYcWZIMzsW9MQsC08KDJUHNbxyc6Ro5Y="; + vendorHash = "sha256-ZzpstCTABL9x5NM5tTiWZqOfI+BSKGZfb+ahbFUmcdo="; buildInputs = [ fuse3 ]; From 47d31a0b6981a0983fe34de09591f3bcb809e58a Mon Sep 17 00:00:00 2001 From: mjmar01 Date: Sat, 22 Mar 2025 18:55:18 +0100 Subject: [PATCH 29/33] tinygo: 0.35.0 -> 0.37.0 --- .../compilers/tinygo/0001-GNUmakefile.patch | 13 +++++++------ pkgs/development/compilers/tinygo/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 +--- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/pkgs/development/compilers/tinygo/0001-GNUmakefile.patch b/pkgs/development/compilers/tinygo/0001-GNUmakefile.patch index db4feeb9af66..eb9a44038666 100644 --- a/pkgs/development/compilers/tinygo/0001-GNUmakefile.patch +++ b/pkgs/development/compilers/tinygo/0001-GNUmakefile.patch @@ -1,7 +1,7 @@ diff --git a/GNUmakefile b/GNUmakefile --- a/GNUmakefile +++ b/GNUmakefile -@@ -14,11 +14,6 @@ LLVM_VERSIONS = 18 17 16 15 +@@ -14,11 +14,6 @@ LLVM_VERSIONS = 19 18 17 16 15 errifempty = $(if $(1),$(1),$(error $(2))) detect = $(shell which $(call errifempty,$(firstword $(foreach p,$(2),$(shell command -v $(p) 2> /dev/null && echo $(p)))),failed to locate $(1) at any of: $(2))) toolSearchPathsVersion = $(1)-$(2) @@ -13,26 +13,27 @@ diff --git a/GNUmakefile b/GNUmakefile # First search for a custom built copy, then move on to explicitly version-tagged binaries, then just see if the tool is in path with its normal name. findLLVMTool = $(call detect,$(1),$(abspath llvm-build/bin/$(1)) $(foreach ver,$(LLVM_VERSIONS),$(call toolSearchPathsVersion,$(1),$(ver))) $(1)) CLANG ?= $(call findLLVMTool,clang) -@@ -848,9 +843,8 @@ endif +@@ -939,10 +934,9 @@ endif wasmtest: $(GO) test ./tests/wasm -build/release: tinygo gen-device wasi-libc $(if $(filter 1,$(USE_SYSTEM_BINARYEN)),,binaryen) +build/release: @mkdir -p build/release/tinygo/bin + @mkdir -p build/release/tinygo/lib/bdwgc - @mkdir -p build/release/tinygo/lib/clang/include @mkdir -p build/release/tinygo/lib/CMSIS/CMSIS @mkdir -p build/release/tinygo/lib/macos-minimal-sdk @mkdir -p build/release/tinygo/lib/mingw-w64/mingw-w64-crt/lib-common -@@ -871,7 +865,6 @@ build/release: tinygo gen-device wasi-libc $(if $(filter 1,$(USE_SYSTEM_BINARYEN - ifneq ($(USE_SYSTEM_BINARYEN),1) +@@ -964,7 +958,6 @@ ifneq ($(USE_SYSTEM_BINARYEN),1) @cp -p build/wasm-opt$(EXE) build/release/tinygo/bin endif + @cp -rp lib/bdwgc/* build/release/tinygo/lib/bdwgc - @cp -p $(abspath $(CLANG_SRC))/lib/Headers/*.h build/release/tinygo/lib/clang/include @cp -rp lib/CMSIS/CMSIS/Include build/release/tinygo/lib/CMSIS/CMSIS @cp -rp lib/CMSIS/README.md build/release/tinygo/lib/CMSIS @cp -rp lib/macos-minimal-sdk/* build/release/tinygo/lib/macos-minimal-sdk -@@ -927,8 +920,7 @@ endif +@@ -1026,8 +1019,7 @@ endif @cp -rp lib/wasi-libc/libc-top-half/musl/include build/release/tinygo/lib/wasi-libc/libc-top-half/musl @cp -rp lib/wasi-libc/sysroot build/release/tinygo/lib/wasi-libc/sysroot @cp -rp lib/wasi-cli/wit build/release/tinygo/lib/wasi-cli/wit @@ -43,5 +44,5 @@ diff --git a/GNUmakefile b/GNUmakefile @cp -rp targets build/release/tinygo/targets -- -2.37.2 +2.48.1 diff --git a/pkgs/development/compilers/tinygo/default.nix b/pkgs/development/compilers/tinygo/default.nix index ea4a10ae09c8..e32871b6a40d 100644 --- a/pkgs/development/compilers/tinygo/default.nix +++ b/pkgs/development/compilers/tinygo/default.nix @@ -34,13 +34,13 @@ in buildGoModule rec { pname = "tinygo"; - version = "0.35.0"; + version = "0.37.0"; src = fetchFromGitHub { owner = "tinygo-org"; repo = "tinygo"; rev = "v${version}"; - hash = "sha256-oy6797o3lMMRJ+bPHY59Bv7mX25aEwBn4OslAohfY2g="; + hash = "sha256-I/9JXjt6aF/80Mh3iRgUYXv4l+m3XIpmKsIBviOuWCo="; fetchSubmodules = true; # The public hydra server on `hydra.nixos.org` is configured with # `max_output_size` of 3GB. The purpose of this `postFetch` step @@ -51,7 +51,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-aY1gX++Dc5/G6VFXnP7sBdekk2IKHlenOC0erlB/Quw="; + vendorHash = "sha256-juADakh+s8oEY9UXUwxknvVeL1TgB/zRi8Xtzt/4qPA="; patches = [ ./0001-GNUmakefile.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5740c1f76e31..c741c53af80a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6676,9 +6676,7 @@ with pkgs; tinycc = darwin.apple_sdk_11_0.callPackage ../development/compilers/tinycc { }; - tinygo = callPackage ../development/compilers/tinygo { - llvmPackages = llvmPackages_18; - }; + tinygo = callPackage ../development/compilers/tinygo { }; urweb = callPackage ../development/compilers/urweb { icu = icu67; From 3416e912224f94923b32cb213687c3f6dbbc3e46 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 23 Mar 2025 22:30:23 +0000 Subject: [PATCH 30/33] phpExtensions.tideways: 5.19.0 -> 5.20.0 --- pkgs/development/php-packages/tideways/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/php-packages/tideways/default.nix b/pkgs/development/php-packages/tideways/default.nix index 210a44bd82cf..618bd9d960eb 100644 --- a/pkgs/development/php-packages/tideways/default.nix +++ b/pkgs/development/php-packages/tideways/default.nix @@ -23,7 +23,7 @@ in stdenvNoCC.mkDerivation (finalAttrs: { pname = "tideways-php"; extensionName = "tideways"; - version = "5.19.0"; + version = "5.20.0"; src = finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system} @@ -43,15 +43,15 @@ stdenvNoCC.mkDerivation (finalAttrs: { sources = { "x86_64-linux" = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/tideways/extension/${finalAttrs.version}/tideways-php-${finalAttrs.version}-x86_64.tar.gz"; - hash = "sha256-AaTrbrdi/XLeKlG+//DTjRGQEheLTtfHwx7Ztn+/Nuk="; + hash = "sha256-uAmsmz+4tsCGw4jlzyZbUNjuzBU/HcIDWrHCC+0t4Xw="; }; "aarch64-linux" = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/tideways/extension/${finalAttrs.version}/tideways-php-${finalAttrs.version}-arm64.tar.gz"; - hash = "sha256-BSXKLxh2ex7rU4vsxHWqQIca+yFQlZDbB0TyNcpYmKs="; + hash = "sha256-gPhr32G6h/U1uR/aaeIWpOaDV9HF8EbQF7p1kJ5SDis="; }; "aarch64-darwin" = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/tideways/extension/${finalAttrs.version}/tideways-php-${finalAttrs.version}-macos-arm.tar.gz"; - hash = "sha256-a63cr/547MxyB7irVlONUpdep3M42YA2C6H9sGbEAI8="; + hash = "sha256-VfgX1SNYKoFR290gRoRXfD5CoLhDPkK+3+4o13P1kiM="; }; }; From 5b4ceb84a9da0857a549f46de37149735ab52aa9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 23 Mar 2025 23:40:17 +0000 Subject: [PATCH 31/33] vscode-extensions.saoudrizwan.claude-dev: 3.6.9 -> 3.8.0 --- .../vscode/extensions/saoudrizwan.claude-dev/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix index 7822a034f980..f75dcc1828df 100644 --- a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix +++ b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "claude-dev"; publisher = "saoudrizwan"; - version = "3.6.9"; - hash = "sha256-KAP9NhZDfga9/qLcoF/KJJNFRYnAxLlxxnITV3bUYtw="; + version = "3.8.0"; + hash = "sha256-v3ejRGAvJm4nExQLMuQEB06Kf0IERVSivVxadovrboo="; }; meta = { From 3629384b56b5b40bcc9ff0f5491f067444b256ac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Mar 2025 00:59:39 +0000 Subject: [PATCH 32/33] chglog: 0.6.2 -> 0.7.0 --- pkgs/by-name/ch/chglog/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ch/chglog/package.nix b/pkgs/by-name/ch/chglog/package.nix index 468ac4b66711..ddaffe0765e0 100644 --- a/pkgs/by-name/ch/chglog/package.nix +++ b/pkgs/by-name/ch/chglog/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "chglog"; - version = "0.6.2"; + version = "0.7.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = "chglog"; tag = "v${version}"; - hash = "sha256-A6PqsyYfhIu3DF1smD5NRLRwISUB806hMQNtDq0G/8Y="; + hash = "sha256-i7KJB5EWq1khP4oxxXGH2tYLJ9s6MAWd1Ndfk7LV0Vc="; }; - vendorHash = "sha256-CbpSlAQLHRyT5Uo9rY/gr+F2jAcqA9M8E8+l3PncdXE="; + vendorHash = "sha256-EyA440J3QLQI+NvSZrksjIlmNOIOt1YO/5ZZMTV/GIs="; ldflags = [ "-s" From adbdae5c3a8f60d858b08d0db2833953d4e9650c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Mar 2025 01:55:27 +0000 Subject: [PATCH 33/33] dprint: 0.49.0 -> 0.49.1 --- pkgs/by-name/dp/dprint/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/dp/dprint/package.nix b/pkgs/by-name/dp/dprint/package.nix index bb0f04ba2f5c..a54dc2af687a 100644 --- a/pkgs/by-name/dp/dprint/package.nix +++ b/pkgs/by-name/dp/dprint/package.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { pname = "dprint"; - version = "0.49.0"; + version = "0.49.1"; # Prefer repository rather than crate here # - They have Cargo.lock in the repository @@ -20,11 +20,11 @@ rustPlatform.buildRustPackage rec { owner = "dprint"; repo = "dprint"; tag = version; - hash = "sha256-IhxtHOf4IY95B7UQPSOyLj4LqvcD2I9RxEu8B+OjtCE="; + hash = "sha256-6ye9FqOGW40TqoDREQm6pZAQaSuO2o9SY5RSfpmwKV4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-OdtUzlvbezeNk06AB6mzR3Rybh08asJJ3roNX0WOg54="; + cargoHash = "sha256-OHRXujyewiDlY4AQEEqmcnmdec1lbWH/y6tPW1nNExE="; nativeBuildInputs = lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ installShellFiles