From 429a135854f6e35908ff872786b34941d3068c0d Mon Sep 17 00:00:00 2001 From: Aaron VerDow Date: Mon, 17 Feb 2025 18:17:06 -0600 Subject: [PATCH 01/15] numworks-epsilon: add .desktop file --- pkgs/by-name/nu/numworks-epsilon/numworks.svg | 4 +++ pkgs/by-name/nu/numworks-epsilon/package.nix | 27 ++++++++++++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 pkgs/by-name/nu/numworks-epsilon/numworks.svg diff --git a/pkgs/by-name/nu/numworks-epsilon/numworks.svg b/pkgs/by-name/nu/numworks-epsilon/numworks.svg new file mode 100644 index 000000000000..0184a5fc0fa4 --- /dev/null +++ b/pkgs/by-name/nu/numworks-epsilon/numworks.svg @@ -0,0 +1,4 @@ + + + + diff --git a/pkgs/by-name/nu/numworks-epsilon/package.nix b/pkgs/by-name/nu/numworks-epsilon/package.nix index 337322bfb039..57a5a83d1be1 100644 --- a/pkgs/by-name/nu/numworks-epsilon/package.nix +++ b/pkgs/by-name/nu/numworks-epsilon/package.nix @@ -11,6 +11,8 @@ gcc-arm-embedded, pkg-config, python3Packages, + makeDesktopItem, + copyDesktopItems, }: stdenv.mkDerivation rec { @@ -24,7 +26,11 @@ stdenv.mkDerivation rec { hash = "sha256-w9ddcULE1MrGnYcXA0qOg1elQv/eBhcXqhMSjWT3Bkk="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + copyDesktopItems + ]; + buildInputs = [ libpng libjpeg @@ -47,9 +53,28 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp -r ./output/release/simulator/linux/* $out/bin/ + # To build this svg: + # copy white path from ion/src/simulator/assets/icon_mask.svg + # paste into ion/src/simulator/assets/logo.svg and change fill to #edb14b + install -Dm644 ${./numworks.svg} $out/share/icons/hicolor/scalable/apps/numworks.svg + runHook postInstall ''; + desktopItems = [ + (makeDesktopItem { + name = "epsilon"; + exec = "epsilon"; + icon = "numworks"; + desktopName = "NumWorks Epsilon Calculator"; + categories = [ + "Utility" + "Math" + ]; + type = "Application"; + }) + ]; + meta = with lib; { description = "Simulator for Epsilon, a High-performance graphing calculator operating system"; homepage = "https://numworks.com/"; From 5c6903ea024a19d4911fab1ba8c92769d3b3dac7 Mon Sep 17 00:00:00 2001 From: Aaron VerDow Date: Fri, 14 Mar 2025 11:05:53 -0500 Subject: [PATCH 02/15] numworks-epsilon: build logo from source --- pkgs/by-name/nu/numworks-epsilon/numworks.svg | 4 ---- pkgs/by-name/nu/numworks-epsilon/package.nix | 18 ++++++++++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) delete mode 100644 pkgs/by-name/nu/numworks-epsilon/numworks.svg diff --git a/pkgs/by-name/nu/numworks-epsilon/numworks.svg b/pkgs/by-name/nu/numworks-epsilon/numworks.svg deleted file mode 100644 index 0184a5fc0fa4..000000000000 --- a/pkgs/by-name/nu/numworks-epsilon/numworks.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/pkgs/by-name/nu/numworks-epsilon/package.nix b/pkgs/by-name/nu/numworks-epsilon/package.nix index 57a5a83d1be1..4280eb9ab4f8 100644 --- a/pkgs/by-name/nu/numworks-epsilon/package.nix +++ b/pkgs/by-name/nu/numworks-epsilon/package.nix @@ -53,10 +53,20 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp -r ./output/release/simulator/linux/* $out/bin/ - # To build this svg: - # copy white path from ion/src/simulator/assets/icon_mask.svg - # paste into ion/src/simulator/assets/logo.svg and change fill to #edb14b - install -Dm644 ${./numworks.svg} $out/share/icons/hicolor/scalable/apps/numworks.svg + # Build the logo + assets="$src/ion/src/simulator/assets" + logo_dir="$out/share/icons/hicolor/scalable/apps" + logo="$logo_dir/numworks.svg" + mkdir -p "$logo_dir" + + # Take opening svg tag + grep ' "$logo" + + # Insert path from logo mask and change color + grep path "$assets/icon_mask.svg" | sed 's/fill="[^"]*"/fill="#edb14b"/' >> "$logo" + + # Add remainder of logo + grep -v '> "$logo" runHook postInstall ''; From aa2922b69f0245008d93e9edf9f34894db724d89 Mon Sep 17 00:00:00 2001 From: Chandler Swift Date: Mon, 31 Mar 2025 23:09:18 -0500 Subject: [PATCH 03/15] =?UTF-8?q?factorio,=20factorio-expansion,=20factori?= =?UTF-8?q?o-headless:=202.0.42=20=E2=86=92=202.0.43?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/fa/factorio/versions.json | 32 +++++++++++++------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/fa/factorio/versions.json b/pkgs/by-name/fa/factorio/versions.json index 74eb8b077faf..63d9bca496a2 100644 --- a/pkgs/by-name/fa/factorio/versions.json +++ b/pkgs/by-name/fa/factorio/versions.json @@ -14,14 +14,14 @@ }, "stable": { "candidateHashFilenames": [ - "factorio_linux_2.0.42.tar.xz" + "factorio_linux_2.0.43.tar.xz" ], - "name": "factorio_alpha_x64-2.0.42.tar.xz", + "name": "factorio_alpha_x64-2.0.43.tar.xz", "needsAuth": true, - "sha256": "c99a4349d4e29e0fd16ecbd710958232d454d3a412ec23b4ff2bd93a31e306ff", + "sha256": "971c293f46d2e021be762eb23c45c17746aa5b8ec74e30fef5f46fa32bb7e1aa", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.42/alpha/linux64", - "version": "2.0.42" + "url": "https://factorio.com/get-download/2.0.43/alpha/linux64", + "version": "2.0.43" } }, "demo": { @@ -62,14 +62,14 @@ }, "stable": { "candidateHashFilenames": [ - "factorio-space-age_linux_2.0.42.tar.xz" + "factorio-space-age_linux_2.0.43.tar.xz" ], - "name": "factorio_expansion_x64-2.0.42.tar.xz", + "name": "factorio_expansion_x64-2.0.43.tar.xz", "needsAuth": true, - "sha256": "41c8c8dacad22f5d94399cd5272a3311e38917937bd1a4d102aac7286afc580e", + "sha256": "43d98f9dfa4edc15a622b9881f71673902710ef8aa12cccc7f6e8ccd7962488e", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.42/expansion/linux64", - "version": "2.0.42" + "url": "https://factorio.com/get-download/2.0.43/expansion/linux64", + "version": "2.0.43" } }, "headless": { @@ -87,15 +87,15 @@ }, "stable": { "candidateHashFilenames": [ - "factorio-headless_linux_2.0.42.tar.xz", - "factorio_headless_x64_2.0.42.tar.xz" + "factorio-headless_linux_2.0.43.tar.xz", + "factorio_headless_x64_2.0.43.tar.xz" ], - "name": "factorio_headless_x64-2.0.42.tar.xz", + "name": "factorio_headless_x64-2.0.43.tar.xz", "needsAuth": false, - "sha256": "b5b8b8bdc915e67dbc1710cd3d6aa6802d397b7c0f47db07da8acf39d5bd6376", + "sha256": "bde6e167330c4439ce7df3ac519ea445120258ef676f1f6ad31d0c2816d3aee3", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.42/headless/linux64", - "version": "2.0.42" + "url": "https://factorio.com/get-download/2.0.43/headless/linux64", + "version": "2.0.43" } } } From 5ecb2f292979c4fa46b783279fc8821d27af5f01 Mon Sep 17 00:00:00 2001 From: Eric Helgeson Date: Mon, 31 Mar 2025 08:11:11 -0500 Subject: [PATCH 04/15] netatalk: 4.1.2 -> 4.2.0 --- .../0000-no-install-under-usr-cupsd.patch | 29 +++++++++++++++++++ .../0001-no-install-under-var-CNID.patch | 13 +++++++++ pkgs/by-name/ne/netatalk/package.nix | 16 +++++++--- 3 files changed, 54 insertions(+), 4 deletions(-) create mode 100644 pkgs/by-name/ne/netatalk/0000-no-install-under-usr-cupsd.patch create mode 100644 pkgs/by-name/ne/netatalk/0001-no-install-under-var-CNID.patch diff --git a/pkgs/by-name/ne/netatalk/0000-no-install-under-usr-cupsd.patch b/pkgs/by-name/ne/netatalk/0000-no-install-under-usr-cupsd.patch new file mode 100644 index 000000000000..aa816565c03e --- /dev/null +++ b/pkgs/by-name/ne/netatalk/0000-no-install-under-usr-cupsd.patch @@ -0,0 +1,29 @@ +diff --git a/config/meson.build b/config/meson.build +index 4d750dba..f6bd6e6e 100644 +--- a/config/meson.build ++++ b/config/meson.build +@@ -55,15 +55,15 @@ elif host_os in ['linux'] + cups_libdir = '/usr/lib' + endif + +-if have_appletalk and have_cups and cups_libdir != '' +- configure_file( +- input: 'pap.in', +- output: 'pap', +- configuration: cdata, +- install: true, +- install_dir: cups_libdir / 'cups/backend', +- ) +-endif ++#if have_appletalk and have_cups and cups_libdir != '' ++# configure_file( ++# input: 'pap.in', ++# output: 'pap', ++# configuration: cdata, ++# install: true, ++# install_dir: cups_libdir / 'cups/backend', ++# ) ++#endif + + foreach file : static_conf_files + if ( diff --git a/pkgs/by-name/ne/netatalk/0001-no-install-under-var-CNID.patch b/pkgs/by-name/ne/netatalk/0001-no-install-under-var-CNID.patch new file mode 100644 index 000000000000..740756d89ad6 --- /dev/null +++ b/pkgs/by-name/ne/netatalk/0001-no-install-under-var-CNID.patch @@ -0,0 +1,13 @@ +diff --git a/config/meson.build b/config/meson.build +index 4d750dba..111389e7 100644 +--- a/config/meson.build ++++ b/config/meson.build +@@ -89,7 +89,7 @@ if ( + ) + endif + +-install_data('README', install_dir: localstatedir / 'netatalk/CNID') ++# install_data('README', install_dir: localstatedir / 'netatalk/CNID') + + if have_pam + subdir('pam') diff --git a/pkgs/by-name/ne/netatalk/package.nix b/pkgs/by-name/ne/netatalk/package.nix index 9832c80527c5..0558aa9649af 100644 --- a/pkgs/by-name/ne/netatalk/package.nix +++ b/pkgs/by-name/ne/netatalk/package.nix @@ -23,18 +23,24 @@ glib, dbus, docbook-xsl-nons, - libxslt, + cmark-gfm, + iniparser, }: stdenv.mkDerivation (finalAttrs: { pname = "netatalk"; - version = "4.1.2"; + version = "4.2.0"; src = fetchurl { url = "mirror://sourceforge/netatalk/netatalk/netatalk-${finalAttrs.version}.tar.xz"; - hash = "sha256-qCX2/37+2wm7nKdXJ6tDEmeXAA+Jd123LI2VIL9IHpw="; + hash = "sha256-doqRAU4pjcHRTvKOvjMN2tSZKOPDTzBzU7i90xf1ClI="; }; + patches = [ + ./0000-no-install-under-usr-cupsd.patch + ./0001-no-install-under-var-CNID.patch + ]; + nativeBuildInputs = [ pkg-config meson @@ -59,11 +65,13 @@ stdenv.mkDerivation (finalAttrs: { perl dbus docbook-xsl-nons - libxslt + cmark-gfm + iniparser ]; mesonFlags = [ "-Dwith-appletalk=true" + "-Dwith-statedir-path=/var/lib" "-Dwith-bdb-path=${db.out}" "-Dwith-bdb-include-path=${db.dev}/include" "-Dwith-install-hooks=false" From 418d09c0859ce2002190b800571748fb12dec21b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 2 Apr 2025 02:05:29 +0000 Subject: [PATCH 05/15] termpaint: 0.3.0 -> 0.3.1 --- pkgs/by-name/te/termpaint/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/te/termpaint/package.nix b/pkgs/by-name/te/termpaint/package.nix index 217d27955192..e4fe01bb4a19 100644 --- a/pkgs/by-name/te/termpaint/package.nix +++ b/pkgs/by-name/te/termpaint/package.nix @@ -9,13 +9,13 @@ }: stdenv.mkDerivation (final: { name = "termpaint"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "termpaint"; repo = "termpaint"; rev = final.version; - hash = "sha256-AsbUJjz51pedmemI0racMgWRzpbIeNJrK/walFUniR4="; + hash = "sha256-7mfGTC5vJ4806bDbrPMSVthtW05a+M3vgUlHGbtaI4Q="; }; patches = [ ./0001-meson.build-use-prefix.patch ]; From 0b0fcb8e7d023e6c4017c5daf21852670a7daa89 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 6 Apr 2025 19:47:25 +0000 Subject: [PATCH 06/15] supersonic-wayland: 0.14.0 -> 0.15.0 --- pkgs/by-name/su/supersonic/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/su/supersonic/package.nix b/pkgs/by-name/su/supersonic/package.nix index 6fcd56c2104a..934a2fe2374e 100644 --- a/pkgs/by-name/su/supersonic/package.nix +++ b/pkgs/by-name/su/supersonic/package.nix @@ -21,16 +21,16 @@ assert waylandSupport -> stdenv.hostPlatform.isLinux; buildGoModule rec { pname = "supersonic" + lib.optionalString waylandSupport "-wayland"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "dweymouth"; repo = "supersonic"; rev = "v${version}"; - hash = "sha256-ua2INyKPncXDOwzmKrgnRCb7q8CFEApEaYuBbQeau98="; + hash = "sha256-U6J1L2KDAEhIrSpbS5wMSc1Q9y5YMahhFNe6ArbwV2s="; }; - vendorHash = "sha256-5LxYD9kLUvKgXmDCw1SNBM6ay8Vayj+PyoZRVptSM0c="; + vendorHash = "sha256-fc86z8bvdFI3LdlyHej2G42O554hpRszqre+e3WUOKI="; nativeBuildInputs = [ From f6885105e954437cec44543e55870ee9c3d4a1d8 Mon Sep 17 00:00:00 2001 From: hotburger <33610620+hotburger@users.noreply.github.com> Date: Mon, 31 Mar 2025 13:13:48 -0700 Subject: [PATCH 07/15] nixos/restic: escape settings in wrapper script --- nixos/modules/services/backup/restic.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/backup/restic.nix b/nixos/modules/services/backup/restic.nix index ce8bcc3994b8..69df4f60d8de 100644 --- a/nixos/modules/services/backup/restic.nix +++ b/nixos/modules/services/backup/restic.nix @@ -465,8 +465,8 @@ in # set same environment variables as the systemd service ${lib.pipe config.systemd.services."restic-backups-${name}".environment [ (lib.filterAttrs (n: v: v != null && n != "PATH")) - (lib.mapAttrsToList (n: v: "${n}=${v}")) - (lib.concatStringsSep "\n") + (lib.mapAttrs (_: v: "${v}")) + (lib.toShellVars) ]} PATH=${config.systemd.services."restic-backups-${name}".environment.PATH}:$PATH From 3a980656214187d8e6ea584a335593569101ddd2 Mon Sep 17 00:00:00 2001 From: Defelo Date: Tue, 8 Apr 2025 21:29:37 +0000 Subject: [PATCH 08/15] termshot: 0.4.1 -> 0.5.0 --- pkgs/by-name/te/termshot/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/termshot/package.nix b/pkgs/by-name/te/termshot/package.nix index 1c6409d656ea..52c62b373ce0 100644 --- a/pkgs/by-name/te/termshot/package.nix +++ b/pkgs/by-name/te/termshot/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "termshot"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "homeport"; repo = "termshot"; tag = "v${finalAttrs.version}"; - hash = "sha256-vkxOUo1RyzZBN2+wRn8yWV930HrKRJnPwpHnxza5GNE="; + hash = "sha256-fk1Xlgf6WR6dAekv7gZXPfKTEvbnk7FT+mn8UYFbQnQ="; }; - vendorHash = "sha256-Wsoy0jlwMYlN8yh7xncGrxTl0qJsPXV4IdYzU7jStzw="; + vendorHash = "sha256-RuIn4JNt4c47p2uiLtmCVYyY0/K1kJpmUboXHA5vhew="; ldflags = [ "-s" From c093725ab750a39292b4cb709a57cd1fdaba5ca6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Apr 2025 11:55:10 +0000 Subject: [PATCH 09/15] pywal16: 3.8.4 -> 3.8.5 --- pkgs/by-name/py/pywal16/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/py/pywal16/package.nix b/pkgs/by-name/py/pywal16/package.nix index 8f79261a6b37..5bd8232868ec 100644 --- a/pkgs/by-name/py/pywal16/package.nix +++ b/pkgs/by-name/py/pywal16/package.nix @@ -9,14 +9,14 @@ python3.pkgs.buildPythonApplication rec { pname = "pywal16"; - version = "3.8.4"; + version = "3.8.5"; pyproject = true; src = fetchFromGitHub { owner = "eylles"; repo = "pywal16"; tag = version; - hash = "sha256-gdFHAvZD1jBc2ZA5NujRUN1nortlzAj3sLh9B+dMJlk="; + hash = "sha256-At8WgobO65SfFAVh37MGe34C0zyg3m6iJ9hxPkUMITg="; }; build-system = [ python3.pkgs.setuptools ]; From 1486129b1bf30faacedabb02add7bc912392185d Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Mon, 7 Apr 2025 12:46:10 +0200 Subject: [PATCH 10/15] trilium-next-{desktop,server}: 0.92.4 -> 0.92.6 --- pkgs/by-name/tr/trilium-next-desktop/package.nix | 10 +++++----- pkgs/by-name/tr/trilium-next-server/package.nix | 9 ++++----- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/tr/trilium-next-desktop/package.nix b/pkgs/by-name/tr/trilium-next-desktop/package.nix index df83255ce58b..37bec86b0668 100644 --- a/pkgs/by-name/tr/trilium-next-desktop/package.nix +++ b/pkgs/by-name/tr/trilium-next-desktop/package.nix @@ -15,7 +15,7 @@ let pname = "trilium-next-desktop"; - version = "0.92.4"; + version = "0.92.6"; triliumSource = os: arch: sha256: { url = "https://github.com/TriliumNext/Notes/releases/download/v${version}/TriliumNextNotes-v${version}-${os}-${arch}.zip"; @@ -26,10 +26,10 @@ let darwinSource = triliumSource "macos"; # exposed like this for update.sh - x86_64-linux.sha256 = "12z6r38ab8jrjgic370q5v1y17m9brj38gfqdg05drf7a25xam8r"; - aarch64-linux.sha256 = "0zsc7c7q07zml91sqvwgz8x3vql1mlhvb7msf7vx22w94dypzivf"; - x86_64-darwin.sha256 = "09ipqfr77xqlgbzh2dvlidm532isg8jj8iwawjldq74ncbv8m5h0"; - aarch64-darwin.sha256 = "031nz4f3rdjg3cyvadax4shchr7liyrzsn3ab6whsp3mhnb9wr9l"; + x86_64-linux.sha256 = "1ky5w6iwqcsc66ywgamkfs9yd6bp51c3y69251pi4b365dwbglf5"; + aarch64-linux.sha256 = "1zm6g2rkg31ahnn8y5h42vb632pqjg6d8kb4xkkrb4pp9h71sgjm"; + x86_64-darwin.sha256 = "011y5vh0bfn73l8n4my5pdpgrvvicy1lvnjrb1qyaglg7gw2sy0r"; + aarch64-darwin.sha256 = "05v6pk1h5y5kqwjkixji3a44dcr219320z0i6yvwv4d8mc943qhs"; sources = { x86_64-linux = linuxSource "x64" x86_64-linux.sha256; diff --git a/pkgs/by-name/tr/trilium-next-server/package.nix b/pkgs/by-name/tr/trilium-next-server/package.nix index e72e3a68a76b..71bce5aff70b 100644 --- a/pkgs/by-name/tr/trilium-next-server/package.nix +++ b/pkgs/by-name/tr/trilium-next-server/package.nix @@ -7,12 +7,12 @@ }: let - version = "0.92.4"; + version = "0.92.6"; serverSource_x64.url = "https://github.com/TriliumNext/Notes/releases/download/v${version}/TriliumNextNotes-Server-v${version}-linux-x64.tar.xz"; - serverSource_x64.sha256 = "1bcacr5sxmrq9zvh8xjyr30y5mz0y6qyx2m18dblswdi0mbi7cv4"; + serverSource_x64.sha256 = "1mh7q11hwp5vrbdrwb0apmxkiv90i3163m8a3cbv0jhd5amv9rjv"; serverSource_arm64.url = "https://github.com/TriliumNext/Notes/releases/download/v${version}/TriliumNextNotes-Server-v${version}-linux-arm64.tar.xz"; - serverSource_arm64.sha256 = "04mjkqywwdax46r8q8wygi9dxglz2qipmlrv3cqqpdvjm0yxh2g2"; + serverSource_arm64.sha256 = "1w5208izjifcq4vsryjpmw2nr140fk2h802q9lkil1646r2b5lyg"; serverSource = if stdenv.hostPlatform.isx86_64 then @@ -56,8 +56,7 @@ stdenv.mkDerivation { --add-flags "src/main" # Clean up broken symlinks and build tools. - rm "$out"/share/trilium-server/node/bin/{npm,npx} - rm -r "$out"/share/trilium-server/node_modules/{@npmcli,@rollup,@babel,.bin} + rm -r "$out"/share/trilium-server/node_modules/{@npmcli,@rollup,@babel} runHook postInstall ''; From bee2c4a789c244d00f7d7bd71c15c2cb3afb44f3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Apr 2025 12:45:41 +0000 Subject: [PATCH 11/15] tbox: 1.7.6 -> 1.7.7 --- pkgs/by-name/tb/tbox/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tb/tbox/package.nix b/pkgs/by-name/tb/tbox/package.nix index 54ee57c0b5a0..992e8d95bc72 100644 --- a/pkgs/by-name/tb/tbox/package.nix +++ b/pkgs/by-name/tb/tbox/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "tbox"; - version = "1.7.6"; + version = "1.7.7"; src = fetchFromGitHub { owner = "tboox"; repo = "tbox"; rev = "v${version}"; - hash = "sha256-cwpZ7F8WzT/46HrckHe0Aug2mxirCkNA68aCxg/FcsE="; + hash = "sha256-piPfPg3NAvP2zhWgtPlNvlAHoqIU77TE/kd1B/6GIuc="; }; configureFlags = [ From 310aa17516f0ad5596ce32a02eface2a1585c415 Mon Sep 17 00:00:00 2001 From: Brian McGee Date: Wed, 9 Apr 2025 15:29:47 +0100 Subject: [PATCH 12/15] age: add age-plugin-sss to `passthru.plugins` --- pkgs/by-name/ag/age/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/ag/age/package.nix b/pkgs/by-name/ag/age/package.nix index 91c368133fc2..5041f3ba66b5 100644 --- a/pkgs/by-name/ag/age/package.nix +++ b/pkgs/by-name/ag/age/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, installShellFiles, age-plugin-tpm, + age-plugin-sss, age-plugin-ledger, age-plugin-yubikey, age-plugin-fido2-hmac, @@ -58,6 +59,7 @@ buildGoModule (final: { passthru.plugins = { inherit age-plugin-tpm + age-plugin-sss age-plugin-ledger age-plugin-yubikey age-plugin-fido2-hmac From 2d9f8c09b4066ff694a9d388743053d4f0395c5b Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 9 Apr 2025 17:25:19 +0200 Subject: [PATCH 13/15] fwupd: 2.0.7 -> 2.0.8 Diff: https://github.com/fwupd/fwupd/compare/refs/tags/2.0.7...refs/tags/2.0.8 Changelog: https://github.com/fwupd/fwupd/releases/tag/2.0.8 --- pkgs/by-name/fw/fwupd/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fw/fwupd/package.nix b/pkgs/by-name/fw/fwupd/package.nix index e94c689b31c4..7878f424330e 100644 --- a/pkgs/by-name/fw/fwupd/package.nix +++ b/pkgs/by-name/fw/fwupd/package.nix @@ -130,7 +130,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "fwupd"; - version = "2.0.7"; + version = "2.0.8"; # libfwupd goes to lib # daemon, plug-ins and libfwupdplugin go to out @@ -148,7 +148,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "fwupd"; repo = "fwupd"; tag = finalAttrs.version; - hash = "sha256-Rus/GaLdoxC1vZskcZeKYE26ys7iBq6szgl2dh1UPsM="; + hash = "sha256-8IFopG/EY/UAB3JSyBJsGmlwGiMufn7rfkeJ9iYfCGU="; }; patches = [ From bc0b105ed11afa4d073e2b60ce6b94c1a72253bc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 10 Apr 2025 02:37:45 +1000 Subject: [PATCH 14/15] python312Packages.uiprotect: 7.5.1 -> 7.5.2 (#397296) https://github.com/uilibs/uiprotect/blob/v7.5.2/CHANGELOG.md --- pkgs/development/python-modules/uiprotect/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/uiprotect/default.nix b/pkgs/development/python-modules/uiprotect/default.nix index 0e91b028c2c1..a7cf37377088 100644 --- a/pkgs/development/python-modules/uiprotect/default.nix +++ b/pkgs/development/python-modules/uiprotect/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pname = "uiprotect"; - version = "7.5.1"; + version = "7.5.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -49,7 +49,7 @@ buildPythonPackage rec { owner = "uilibs"; repo = "uiprotect"; tag = "v${version}"; - hash = "sha256-moGS1hfCU8BCdAzvr0Np7lF32RucigM9YANZI6+sALw="; + hash = "sha256-cXvjxXvGnIJ5lRtH8t5TFTUgGKUZOcGkyur9e+Anbf4="; }; build-system = [ poetry-core ]; @@ -109,7 +109,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API for UniFi Protect (Unofficial)"; homepage = "https://github.com/uilibs/uiprotect"; - changelog = "https://github.com/uilibs/uiprotect/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/uilibs/uiprotect/blob/${src.tag}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; }; From 75b0624f9898b0774855193ea507b334c76a1528 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Apr 2025 17:16:30 +0000 Subject: [PATCH 15/15] vscode: 1.99.0 -> 1.99.1 --- pkgs/applications/editors/vscode/vscode.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index e37cd096cc3b..62e54f855d05 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -36,22 +36,22 @@ let sha256 = { - x86_64-linux = "1fds83amgkzp9nz7cvs432ilr602lr45h916vkq8qhpbb84ildd2"; - x86_64-darwin = "1pmda39jz05d0g3k6rgavhwmgxkldmarbj59fd9i0b5dcspzybxf"; - aarch64-linux = "148cpbhz14aldqklnma9mpakylkx2qk86k5ppij0zlqb5m6mgnaz"; - aarch64-darwin = "10v37bcl8wg4j5snd7n3l7zwqf51vkx4cs2abf33ysazmafvnfpd"; - armv7l-linux = "10vfnk87g4agwp0phh7l9k7hg727n1l4fcvqn1bxbrix9hbq7bbc"; + x86_64-linux = "05abq952zv63zz99dib7l1y7w15l4d8zjk924ag25jasbqdl48fm"; + x86_64-darwin = "0ak1avw3s327npqx3fb0gxpdwa6hwf48fv1xf3kdrcjrizwwdy1y"; + aarch64-linux = "02v57sfg13xdy7rzn7dvymimp6q3wlf4fl08nv75vv8r9kdpwza0"; + aarch64-darwin = "0km0spd1ppmlkwnf1yc1hm8b1hwddhy25ydfb8lbfcx3y2n0dgag"; + armv7l-linux = "0h96b3cpnzz7wcnnarl6dd0cw50m54k74lbxbdasl3kq84zq8y0h"; } .${system} or throwSystem; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.99.0"; + version = "1.99.1"; pname = "vscode" + lib.optionalString isInsiders "-insiders"; # This is used for VS Code - Remote SSH test - rev = "4437686ffebaf200fa4a6e6e67f735f3edf24ada"; + rev = "7c6fdfb0b8f2f675eb0b47f3d95eeca78962565b"; executableName = "code" + lib.optionalString isInsiders "-insiders"; longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders"; @@ -75,7 +75,7 @@ callPackage ./generic.nix rec { src = fetchurl { name = "vscode-server-${rev}.tar.gz"; url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable"; - sha256 = "11705fdsb7hc25awkiknjc7pb93x2w74yxkf3351c6n2sf3i2755"; + sha256 = "03znn17l4qb40yml5kq5l7j65yr5axxa44g6a03g6dkj8fqnaz8s"; }; stdenv = stdenvNoCC; };