From ae16fe151c7078177b7d6d5051c4405b8f844953 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 14 Mar 2024 04:08:29 +0000 Subject: [PATCH 1/2] opencomposite: unstable-2024-02-16 -> unstable-2024-03-04 --- pkgs/development/libraries/opencomposite/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/opencomposite/default.nix b/pkgs/development/libraries/opencomposite/default.nix index fc1b6e631964..dff4e5988cda 100644 --- a/pkgs/development/libraries/opencomposite/default.nix +++ b/pkgs/development/libraries/opencomposite/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation { pname = "opencomposite"; - version = "unstable-2024-02-16"; + version = "unstable-2024-03-04"; src = fetchFromGitLab { owner = "znixian"; repo = "OpenOVR"; - rev = "737bbedd29343bc2f808804e2b24302390a07655"; - hash = "sha256-azb7T0d0YMQRc0Slq1tzNj6bOmCzfHW3ciY9lN+RTao="; + rev = "1bfdf67358add5f573efedbec1fa65d18b790e0e"; + hash = "sha256-qF5oMI9B5a1oE2gQb/scbom/39Efccja0pTPHHaHMA8="; }; nativeBuildInputs = [ From fe9f697fc469e944868a853db392b1996d232918 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 14 Mar 2024 12:45:38 +0100 Subject: [PATCH 2/2] opencomposite{,-helper}: move to pkgs/by-name --- .../op/opencomposite-helper/package.nix} | 0 .../default.nix => by-name/op/opencomposite/package.nix} | 0 pkgs/top-level/all-packages.nix | 4 ---- 3 files changed, 4 deletions(-) rename pkgs/{development/libraries/opencomposite/helper.nix => by-name/op/opencomposite-helper/package.nix} (100%) rename pkgs/{development/libraries/opencomposite/default.nix => by-name/op/opencomposite/package.nix} (100%) diff --git a/pkgs/development/libraries/opencomposite/helper.nix b/pkgs/by-name/op/opencomposite-helper/package.nix similarity index 100% rename from pkgs/development/libraries/opencomposite/helper.nix rename to pkgs/by-name/op/opencomposite-helper/package.nix diff --git a/pkgs/development/libraries/opencomposite/default.nix b/pkgs/by-name/op/opencomposite/package.nix similarity index 100% rename from pkgs/development/libraries/opencomposite/default.nix rename to pkgs/by-name/op/opencomposite/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c42e6dad6209..bba96bca992c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6137,10 +6137,6 @@ with pkgs; opam-publish = callPackage ../development/tools/ocaml/opam-publish { }; - opencomposite = callPackage ../development/libraries/opencomposite { }; - - opencomposite-helper = callPackage ../development/libraries/opencomposite/helper.nix { }; - osdlyrics = callPackage ../applications/audio/osdlyrics { }; ossutil = callPackage ../tools/admin/ossutil { };