From caeeaf5b6d45ccbab1a841c98b351bf7d14f0290 Mon Sep 17 00:00:00 2001 From: Nojus Date: Wed, 30 Jul 2025 22:11:03 +0200 Subject: [PATCH 1/5] lsfg-vk(-ui): 1.0.0 release bump --- lsfg-vk-ui.nix | 10 +++++----- lsfg-vk.nix | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lsfg-vk-ui.nix b/lsfg-vk-ui.nix index 2fe4239..fd465fc 100644 --- a/lsfg-vk-ui.nix +++ b/lsfg-vk-ui.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage { pname = "lsfg-vk-ui"; - version = "0.9.0-2025-07-30-b4f2833"; + version = "1.0.0"; src = fetchFromGitHub { owner = "PancakeTAS"; repo = "lsfg-vk"; - rev = "b4f2833785845c4c08dd78e9a793cfd56d8752e4"; - hash = "sha256-zepZicQ2D0Fx9qxyNyYbOqmEnJVrrsb+qiZ3OXvL8Rs="; + rev = "7113d7d02da9fc9df5cb3b03230d1f7de86f7056"; + hash = "sha256-hWpuPH7mKbeMaLaRUwtlkNLy4lOnJEe+yd54L7y2kV0="; }; - - cargoHash = "sha256-1/3CTCXTqSfb/xtx/Q1whaHPeQ0fxu0Zg2sVJPxdcK0="; + + cargoHash = "sha256-hIQRS/egIDU5Vu/1KWHtpt4S26h+9GadVr+lBAG2LDg="; sourceRoot = "source/ui"; diff --git a/lsfg-vk.nix b/lsfg-vk.nix index 5a7308c..3c9de0b 100644 --- a/lsfg-vk.nix +++ b/lsfg-vk.nix @@ -8,13 +8,13 @@ llvmPackages.stdenv.mkDerivation { pname = "lsfg-vk"; - version = "0.9.0-2025-07-30-b4f2833"; + version = "1.0.0"; src = fetchFromGitHub { owner = "PancakeTAS"; repo = "lsfg-vk"; - rev = "b4f2833785845c4c08dd78e9a793cfd56d8752e4"; - hash = "sha256-zepZicQ2D0Fx9qxyNyYbOqmEnJVrrsb+qiZ3OXvL8Rs="; + rev = "7113d7d02da9fc9df5cb3b03230d1f7de86f7056"; + hash = "sha256-hWpuPH7mKbeMaLaRUwtlkNLy4lOnJEe+yd54L7y2kV0="; fetchSubmodules = true; }; From 754f64f7e489ba16ebc3e77ad8f480c50b5a428c Mon Sep 17 00:00:00 2001 From: Nojus Date: Wed, 30 Jul 2025 22:14:59 +0200 Subject: [PATCH 2/5] flake.lock: bump --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 3b37958..8a9da88 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1752687322, - "narHash": "sha256-RKwfXA4OZROjBTQAl9WOZQFm7L8Bo93FQwSJpAiSRvo=", + "lastModified": 1753694789, + "narHash": "sha256-cKgvtz6fKuK1Xr5LQW/zOUiAC0oSQoA9nOISB0pJZqM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6e987485eb2c77e5dcc5af4e3c70843711ef9251", + "rev": "dc9637876d0dcc8c9e5e22986b857632effeb727", "type": "github" }, "original": { From cdcec1d2be7541113d9b5ce40a28856458b1fad8 Mon Sep 17 00:00:00 2001 From: Nojus Date: Thu, 31 Jul 2025 02:44:21 +0200 Subject: [PATCH 3/5] lsfg-vk-ui: fix fetch hash submodules make a difference, whoops. stuff worked on my side because the repo got cached with the submodules included --- lsfg-vk-ui.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lsfg-vk-ui.nix b/lsfg-vk-ui.nix index fd465fc..d12f832 100644 --- a/lsfg-vk-ui.nix +++ b/lsfg-vk-ui.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage { owner = "PancakeTAS"; repo = "lsfg-vk"; rev = "7113d7d02da9fc9df5cb3b03230d1f7de86f7056"; - hash = "sha256-hWpuPH7mKbeMaLaRUwtlkNLy4lOnJEe+yd54L7y2kV0="; + hash = "sha256-nIyVOil/gHC+5a+sH3vMlcqVhixjJaGWqXbyoh2Nqyw="; }; cargoHash = "sha256-hIQRS/egIDU5Vu/1KWHtpt4S26h+9GadVr+lBAG2LDg="; From 081cd66b1369188777ea146a759d35e99ea6b031 Mon Sep 17 00:00:00 2001 From: Nojus Date: Thu, 31 Jul 2025 07:04:52 +0200 Subject: [PATCH 4/5] lsfg-vk(-ui): sync up with nixpkgs pr --- lsfg-vk-ui.nix | 21 ++++++++++++++------- lsfg-vk.nix | 20 +++++++++----------- 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/lsfg-vk-ui.nix b/lsfg-vk-ui.nix index d12f832..700eb7a 100644 --- a/lsfg-vk-ui.nix +++ b/lsfg-vk-ui.nix @@ -7,17 +7,17 @@ pango, gdk-pixbuf, gtk4, - libadwaita + libadwaita, }: -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage rec { pname = "lsfg-vk-ui"; version = "1.0.0"; src = fetchFromGitHub { owner = "PancakeTAS"; repo = "lsfg-vk"; - rev = "7113d7d02da9fc9df5cb3b03230d1f7de86f7056"; + tag = "v${version}"; hash = "sha256-nIyVOil/gHC+5a+sH3vMlcqVhixjJaGWqXbyoh2Nqyw="; }; @@ -37,11 +37,18 @@ rustPlatform.buildRustPackage { libadwaita ]; - meta = with lib; { - description = "Graphical interface for lsfg-vk"; + postInstall = '' + install -Dm444 $src/ui/rsc/gay.pancake.lsfg-vk-ui.desktop $out/share/applications/gay.pancake.lsfg-vk-ui.desktop + install -Dm444 $src/ui/rsc/icon.png $out/share/icons/hicolor/256x256/apps/gay.pancake.lsfg-vk-ui.png + ''; + + meta = { + description = "Graphical configuration interface for lsfg-vk"; homepage = "https://github.com/PancakeTAS/lsfg-vk/"; - license = licenses.mit; - platforms = platforms.linux; + changelog = "https://github.com/PancakeTAS/lsfg-vk/releases/tag/${src.tag}"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ pabloaul ]; mainProgram = "lsfg-vk-ui"; }; } \ No newline at end of file diff --git a/lsfg-vk.nix b/lsfg-vk.nix index 3c9de0b..63e494c 100644 --- a/lsfg-vk.nix +++ b/lsfg-vk.nix @@ -6,27 +6,23 @@ llvmPackages, }: -llvmPackages.stdenv.mkDerivation { +llvmPackages.stdenv.mkDerivation rec { pname = "lsfg-vk"; version = "1.0.0"; src = fetchFromGitHub { owner = "PancakeTAS"; repo = "lsfg-vk"; - rev = "7113d7d02da9fc9df5cb3b03230d1f7de86f7056"; + tag = "v${version}"; hash = "sha256-hWpuPH7mKbeMaLaRUwtlkNLy4lOnJEe+yd54L7y2kV0="; fetchSubmodules = true; }; postPatch = '' substituteInPlace VkLayer_LS_frame_generation.json \ - --replace "liblsfg-vk.so" "$out/lib/liblsfg-vk.so" + --replace-fail "liblsfg-vk.so" "$out/lib/liblsfg-vk.so" ''; - cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" - ]; - nativeBuildInputs = [ llvmPackages.clang-tools llvmPackages.libllvm @@ -37,10 +33,12 @@ llvmPackages.stdenv.mkDerivation { vulkan-headers ]; - meta = with lib; { + meta = { description = "Vulkan layer for frame generation (Requires owning Lossless Scaling)"; homepage = "https://github.com/PancakeTAS/lsfg-vk/"; - license = licenses.mit; - platforms = platforms.linux; + changelog = "https://github.com/PancakeTAS/lsfg-vk/releases/tag/${src.tag}"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ pabloaul ]; }; -} +} \ No newline at end of file From 62aadfc844b2002abe47cbbc9dfd028033376248 Mon Sep 17 00:00:00 2001 From: Nojus Date: Thu, 28 Aug 2025 09:47:53 +0200 Subject: [PATCH 5/5] flake.lock: bump --- flake.lock | 6 +++--- flake.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 8a9da88..83fcd4c 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1753694789, - "narHash": "sha256-cKgvtz6fKuK1Xr5LQW/zOUiAC0oSQoA9nOISB0pJZqM=", + "lastModified": 1756266583, + "narHash": "sha256-cr748nSmpfvnhqSXPiCfUPxRz2FJnvf/RjJGvFfaCsM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dc9637876d0dcc8c9e5e22986b857632effeb727", + "rev": "8a6d5427d99ec71c64f0b93d45778c889005d9c2", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 663cf94..99e7737 100644 --- a/flake.nix +++ b/flake.nix @@ -1,12 +1,12 @@ { inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - outputs = { nixpkgs, ... }: + outputs = { nixpkgs, ... }: let forAllSystems = nixpkgs.lib.genAttrs [ "x86_64-linux" "aarch64-linux" ]; - in + in { - packages = forAllSystems (system: { + packages = forAllSystems (system: { default = nixpkgs.legacyPackages.${system}.callPackage ./lsfg-vk.nix { }; lsfg-vk = nixpkgs.legacyPackages.${system}.callPackage ./lsfg-vk.nix { }; lsfg-vk-ui = nixpkgs.legacyPackages.${system}.callPackage ./lsfg-vk-ui.nix { };