From 96179893343901726eb96937460fa090ca5518ce Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 9 Sep 2023 19:25:57 -0300 Subject: [PATCH] sound-of-sorting: update - add meta.mainProgram - migrate to by-name --- .../so/sound-of-sorting/package.nix} | 13 ++++++++----- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 8 insertions(+), 7 deletions(-) rename pkgs/{misc/sound-of-sorting/default.nix => by-name/so/sound-of-sorting/package.nix} (73%) diff --git a/pkgs/misc/sound-of-sorting/default.nix b/pkgs/by-name/so/sound-of-sorting/package.nix similarity index 73% rename from pkgs/misc/sound-of-sorting/default.nix rename to pkgs/by-name/so/sound-of-sorting/package.nix index 23529f6b0a18..c6cb6e6a1cf9 100644 --- a/pkgs/misc/sound-of-sorting/default.nix +++ b/pkgs/by-name/so/sound-of-sorting/package.nix @@ -7,9 +7,9 @@ , darwin }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "sound-of-sorting"; - version = "unstable-2022-10-12"; + version = "0.6.5-unstable-2022-10-12"; src = fetchFromGitHub { owner = "bingmann"; @@ -26,13 +26,16 @@ stdenv.mkDerivation { wxGTK32 SDL2 ] - ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa ; + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Cocoa + ]; meta = { description = "Audibilization and Visualization of Sorting Algorithms"; homepage = "https://panthema.net/2013/sound-of-sorting/"; license = lib.licenses.gpl3Plus; + mainProgram = "sound-of-sorting"; maintainers = with lib.maintainers; [ AndersonTorres ]; - platforms = lib.platforms.unix; + inherit (SDL2.meta) platforms; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 17c1ff17d383..959929351dc4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -41109,8 +41109,6 @@ with pkgs; soundmodem = callPackage ../applications/radio/soundmodem { }; - sound-of-sorting = callPackage ../misc/sound-of-sorting { }; - sourceAndTags = callPackage ../misc/source-and-tags { hasktags = haskellPackages.hasktags; };