From 4aff21f203c3a12bdb7405e5cbd20a2e9dc981f2 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 8 Jul 2023 00:00:37 -0300 Subject: [PATCH] sound-of-sorting: refactor - Move camelCase name to aliases --- pkgs/misc/sound-of-sorting/default.nix | 22 +++++++++++++--------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/pkgs/misc/sound-of-sorting/default.nix b/pkgs/misc/sound-of-sorting/default.nix index d7a2e5d1f5f..23529f6b0a1 100644 --- a/pkgs/misc/sound-of-sorting/default.nix +++ b/pkgs/misc/sound-of-sorting/default.nix @@ -7,9 +7,6 @@ , darwin }: -let - inherit (darwin.apple_sdk.frameworks) Cocoa; -in stdenv.mkDerivation { pname = "sound-of-sorting"; version = "unstable-2022-10-12"; @@ -18,17 +15,24 @@ stdenv.mkDerivation { owner = "bingmann"; repo = "sound-of-sorting"; rev = "5cfcaf752593c8cbcf52555dd22745599a7d8b1b"; - sha256 = "sha256-cBrTvFoz6WZIsh5qPPiWxQ338Z0OfcIefiI8CZF6nn8="; + hash = "sha256-cBrTvFoz6WZIsh5qPPiWxQ338Z0OfcIefiI8CZF6nn8="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + ]; - buildInputs = [ wxGTK32 SDL2 ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + buildInputs = [ + wxGTK32 + SDL2 + ] + ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa ; - meta = with lib; { + meta = { description = "Audibilization and Visualization of Sorting Algorithms"; homepage = "https://panthema.net/2013/sound-of-sorting/"; - license = with licenses; gpl3Plus; - maintainers = with maintainers; [ AndersonTorres ]; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 33e0399036c..5953fd17918 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1572,6 +1572,7 @@ mapAliases ({ soldat-unstable = opensoldat; # Added 2022-07-02 solr_8 = throw "'solr' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-03-16 solr = throw "'solr' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-03-16 + soundOfSorting = sound-of-sorting; # Added 2023-07-07 spark2 = throw "'spark2' is no longer supported nixpkgs, please use 'spark'"; # Added 2023-05-08 spark_2_4 = throw "'spark_2_4' is no longer supported nixpkgs, please use 'spark'"; # Added 2023-05-08 spark_3_1 = throw "'spark_3_1' is no longer supported nixpkgs, please use 'spark'"; # Added 2023-05-08 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 53c86009dda..6dcf46a01bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -40341,7 +40341,7 @@ with pkgs; soundmodem = callPackage ../applications/radio/soundmodem { }; - soundOfSorting = callPackage ../misc/sound-of-sorting { }; + sound-of-sorting = callPackage ../misc/sound-of-sorting { }; sourceAndTags = callPackage ../misc/source-and-tags { hasktags = haskellPackages.hasktags;