From 9c48849e6859db70dc97a55afae5cb490c715bc8 Mon Sep 17 00:00:00 2001 From: Nikolaos Karaolidis Date: Thu, 24 Jul 2025 11:02:13 +0100 Subject: [PATCH] Revert "Update" This reverts commit 13f24c688061b77a9fb200a8b70c62797693ef95. --- flake.lock | 6 ++-- packages/default.nix | 2 ++ .../plugins/intro-skipper/default.nix | 4 +-- packages/linux-firmware-latest/default.nix | 31 +++++++++++++++++++ packages/littlelink-server/default.nix | 4 +-- .../obsidian/plugins/excalidraw/default.nix | 6 ++-- .../plugins/url-into-selection/default.nix | 4 +-- packages/obsidian/themes/minimal/default.nix | 4 +-- packages/oidcwarden/default.nix | 4 +-- 9 files changed, 49 insertions(+), 16 deletions(-) create mode 100644 packages/linux-firmware-latest/default.nix diff --git a/flake.lock b/flake.lock index 061eb21..d3dc4e4 100644 --- a/flake.lock +++ b/flake.lock @@ -189,11 +189,11 @@ ] }, "locked": { - "lastModified": 1753266420, - "narHash": "sha256-lsu25hI2Rh6G1wEkORGsWQfVkQ/arUsb+VEKDJaPdnA=", + "lastModified": 1753254080, + "narHash": "sha256-Z9Q6tI23epzbp9Ox/ujjDdoXXO2OIRJctjPDgnjmgf4=", "owner": "nix-community", "repo": "NUR", - "rev": "43afa751acc5ebb38ea549eb6b9899bc18ec84a6", + "rev": "ec8e1c679047de6036c9f9c845f0ae5ff6bb8c49", "type": "github" }, "original": { diff --git a/packages/default.nix b/packages/default.nix index 7738f9b..da940ed 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -62,6 +62,8 @@ jellyfin-plugin-tmdbboxsets = import ./jellyfin/plugins/tmdbboxsets { inherit pkgs; }; jellyfin-plugin-tvdb = import ./jellyfin/plugins/tvdb { inherit pkgs; }; + linux-firmware-latest = import ./linux-firmware-latest { inherit pkgs; }; + littlelink-server = import ./littlelink-server { inherit pkgs; }; obsidian-plugin-better-word-count = import ./obsidian/plugins/better-word-count { inherit pkgs; }; diff --git a/packages/jellyfin/plugins/intro-skipper/default.nix b/packages/jellyfin/plugins/intro-skipper/default.nix index eac1d27..56329da 100644 --- a/packages/jellyfin/plugins/intro-skipper/default.nix +++ b/packages/jellyfin/plugins/intro-skipper/default.nix @@ -2,7 +2,7 @@ # AUTO-UPDATE: nix-update --flake jellyfin-plugin-intro-skipper pkgs.stdenv.mkDerivation (finalAttrs: { pname = "intro-skipper"; - version = "10.10/v1.10.10.22"; + version = "10.10/v1.10.10.20"; src = let @@ -11,7 +11,7 @@ pkgs.stdenv.mkDerivation (finalAttrs: { in pkgs.fetchzip { url = "https://github.com/intro-skipper/intro-skipper/releases/download/${finalAttrs.version}/intro-skipper-${full}.zip"; - sha256 = "sha256-odhvY8/kMR4cCNvyKN8I/xFgSqtHCtk25IZyehInsJw="; + sha256 = "sha256-RlrZkE8108Uj5V90+jw2o5fXb+K+9/hoDcEaSkKLDGg="; stripRoot = false; }; diff --git a/packages/linux-firmware-latest/default.nix b/packages/linux-firmware-latest/default.nix new file mode 100644 index 0000000..3cb3451 --- /dev/null +++ b/packages/linux-firmware-latest/default.nix @@ -0,0 +1,31 @@ +{ pkgs, ... }: +# AUTO-UPDATE: nix-update --flake --version=branch=main linux-firmware-latest +pkgs.stdenvNoCC.mkDerivation { + pname = "linux-firmware"; + version = "20250708-unstable-2025-07-08"; + + src = pkgs.fetchFromGitLab { + owner = "kernel-firmware"; + repo = "linux-firmware"; + rev = "99d64b4f788c16e81b6550ef94f43c6b91cfad2d"; + hash = "sha256-TJ97A9I0ipsqgg7ex3pAQgdhDJcLbkNCvuLppt9a07o="; + }; + + postUnpack = '' + patchShebangs . + ''; + + nativeBuildInputs = with pkgs; [ + python3 + rdfind + which + ]; + + installTargets = [ + "install" + "dedup" + ]; + + makeFlags = [ "DESTDIR=$(out)" ]; + dontFixup = true; +} diff --git a/packages/littlelink-server/default.nix b/packages/littlelink-server/default.nix index 973c074..faa7b1d 100644 --- a/packages/littlelink-server/default.nix +++ b/packages/littlelink-server/default.nix @@ -1,8 +1,8 @@ { pkgs, ... }: -# AUTO-UPDATE: nix-update --flake --version=branch=master littlelink-server --subpackage yarnSrc +# AUTO-UPDATE: nix-update --flake --version=branch=main littlelink-server --subpackage yarnSrc pkgs.stdenv.mkDerivation (finalAttrs: { pname = "littlelink-server"; - version = "0-unstable-2025-06-16"; + version = "0-unstable-2025-07-16"; src = pkgs.fetchFromGitHub { owner = "techno-tim"; diff --git a/packages/obsidian/plugins/excalidraw/default.nix b/packages/obsidian/plugins/excalidraw/default.nix index e8de98a..b75bce4 100644 --- a/packages/obsidian/plugins/excalidraw/default.nix +++ b/packages/obsidian/plugins/excalidraw/default.nix @@ -2,13 +2,13 @@ # AUTO-UPDATE: nix-update --flake obsidian-plugin-excalidraw --subpackage mathjaxToSVG pkgs.buildNpmPackage (finalAttrs: { pname = "obsidian.plugins.excalidraw"; - version = "2.14.0"; + version = "2.13.0"; pkg = pkgs.fetchFromGitHub { owner = "zsviczian"; repo = "obsidian-excalidraw-plugin"; rev = finalAttrs.version; - hash = "sha256-QUPL9WYpfhFf5yFZA7Hh1fGdFxiCwdVMZ6OeF7lypso="; + hash = "sha256-zZDKgVQDwa2Mb5DQtu5/QUQnMbBudQxhrVSNr8Xi44o="; }; mathjaxToSVG = pkgs.buildNpmPackage { @@ -30,7 +30,7 @@ pkgs.buildNpmPackage (finalAttrs: { src = finalAttrs.pkg; - npmDepsHash = "sha256-zfLHskffLfsJoQ2Ftu30wjZ+d3t3C8HqSTUyEHP0NAQ="; + npmDepsHash = "sha256-Cb8PTYW2fxYLlvCrDJhtV5KnOMkSTlBO8QJR4p6wyr8="; npmPackFlags = [ "--ignore-scripts" ]; configurePhase = '' diff --git a/packages/obsidian/plugins/url-into-selection/default.nix b/packages/obsidian/plugins/url-into-selection/default.nix index 4dbe347..ebbebc3 100644 --- a/packages/obsidian/plugins/url-into-selection/default.nix +++ b/packages/obsidian/plugins/url-into-selection/default.nix @@ -2,13 +2,13 @@ # AUTO-UPDATE: nix-update --flake obsidian-plugin-url-into-selection pkgs.buildNpmPackage (finalAttrs: { pname = "url-into-selection"; - version = "1.11.2"; + version = "1.7.0"; src = pkgs.fetchFromGitHub { owner = "denolehov"; repo = "obsidian-url-into-selection"; rev = finalAttrs.version; - hash = "sha256-NnblFzqYRFsTWjaoOpJ0mK9ZdzevuRt+KvfM2yEu6ho="; + hash = "sha256-xmKJOuXirg/LFVK/0925fazW+cm+XUlLpAUgpAS6bZI="; }; patches = [ ./package-lock.patch ]; diff --git a/packages/obsidian/themes/minimal/default.nix b/packages/obsidian/themes/minimal/default.nix index 3720225..c5b86a8 100644 --- a/packages/obsidian/themes/minimal/default.nix +++ b/packages/obsidian/themes/minimal/default.nix @@ -2,13 +2,13 @@ # AUTO-UPDATE: nix-update --flake obsidian-theme-minimal pkgs.buildNpmPackage (finalAttrs: { pname = "minimal"; - version = "8.0.2"; + version = "8.0.1"; src = pkgs.fetchFromGitHub { owner = "kepano"; repo = "obsidian-minimal"; rev = finalAttrs.version; - hash = "sha256-D5PyyraJaryg0Vevzjayo/DVpyeUOPfLjd4KqnR07I8="; + hash = "sha256-9FHkJ47R+cy2Pq62OuUUZQLSxd929xUIsQcpFGb4rso="; }; npmDepsHash = "sha256-R+XeEkDP0MxNQsFCWmHXKtLBcmiOTv9Nw7t2e27kvQg="; diff --git a/packages/oidcwarden/default.nix b/packages/oidcwarden/default.nix index b818c02..bb1e9d9 100644 --- a/packages/oidcwarden/default.nix +++ b/packages/oidcwarden/default.nix @@ -3,13 +3,13 @@ # FIXME: https://github.com/dani-garcia/vaultwarden/pull/3899 pkgs.rustPlatform.buildRustPackage (finalAttrs: { pname = "oidcwarden"; - version = "2025.6.1-3"; + version = "2025.6.1-2"; src = pkgs.fetchFromGitHub { owner = "Timshel"; repo = "OIDCWarden"; rev = "v${finalAttrs.version}"; - hash = "sha256-I4zOWIU8iBQeLMMQSVcKc3w+WodiZ6MDYnKR7H/+v0Y="; + hash = "sha256-wpb+7/a8TEaLvOiMt/POLvl+rb6hHG99audNghSJvII="; }; useFetchCargoVendor = true;