From 40c832b32c40e461f96f19bbe70d4697306a090b Mon Sep 17 00:00:00 2001 From: Zitrone Date: Wed, 12 Jun 2024 07:41:23 +0200 Subject: [PATCH 1/4] CHOWTapeModel: rename to chow-tape-model --- .../ch/chow-tape-model/package.nix} | 10 +++++----- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 6 insertions(+), 7 deletions(-) rename pkgs/{applications/audio/CHOWTapeModel/default.nix => by-name/ch/chow-tape-model/package.nix} (94%) diff --git a/pkgs/applications/audio/CHOWTapeModel/default.nix b/pkgs/by-name/ch/chow-tape-model/package.nix similarity index 94% rename from pkgs/applications/audio/CHOWTapeModel/default.nix rename to pkgs/by-name/ch/chow-tape-model/package.nix index 29c1b82d9d0e..44fc35073d36 100644 --- a/pkgs/applications/audio/CHOWTapeModel/default.nix +++ b/pkgs/by-name/ch/chow-tape-model/package.nix @@ -39,14 +39,14 @@ let # See here: https://forum.juce.com/t/build-fails-on-fedora-wrong-c-version/50902/2 stdenv = gcc11Stdenv; in -stdenv.mkDerivation rec { - pname = "CHOWTapeModel"; +stdenv.mkDerivation (finalAttrs: { + pname = "chow-tape-model"; version = "2.11.4"; src = fetchFromGitHub { owner = "jatinchowdhury18"; repo = "AnalogTapeModel"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-WriHi68Y6hAsrwE+74JtVlAKUR9lfTczj6UK9h2FOGM="; fetchSubmodules = true; }; @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/lib/lv2 $out/lib/vst3 $out/lib/clap $out/bin $out/share/doc/CHOWTapeModel/ - cd CHOWTapeModel_artefacts/${cmakeBuildType} + cd CHOWTapeModel_artefacts/${finalAttrs.cmakeBuildType} cp -r LV2/CHOWTapeModel.lv2 $out/lib/lv2 cp -r VST3/CHOWTapeModel.vst3 $out/lib/vst3 cp -r CLAP/CHOWTapeModel.clap $out/lib/clap @@ -129,4 +129,4 @@ stdenv.mkDerivation rec { broken = stdenv.isAarch64; # since 2021-12-27 on hydra (update to 2.10): https://hydra.nixos.org/build/162558991 mainProgram = "CHOWTapeModel"; }; -} +}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d7cf6ef30692..0f466e1e076f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -176,6 +176,7 @@ mapAliases ({ chia-plotter = throw "chia-plotter has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # Added 2023-11-30 chkservice = throw "chkservice has been removed from nixpkgs, as it has been deleted upstream"; # Added 2024-01-08 chocolateDoom = chocolate-doom; # Added 2023-05-01 + CHOWTapeModel = chow-tape-model; # Added 2024-06-12 chrome-gnome-shell = gnome-browser-connector; # Added 2022-07-27 chromiumBeta = throw "'chromiumBeta' has been removed due to the lack of maintenance in nixpkgs. Consider using 'chromium' instead."; # Added 2023-10-18 chromiumDev = throw "'chromiumDev' has been removed due to the lack of maintenance in nixpkgs. Consider using 'chromium' instead."; # Added 2023-10-18 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d12ff3f330ba..ed24dc1f7054 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29979,8 +29979,6 @@ with pkgs; ChowPhaser = callPackage ../applications/audio/ChowPhaser { }; - CHOWTapeModel = callPackage ../applications/audio/CHOWTapeModel { }; - chromium = callPackage ../applications/networking/browsers/chromium (config.chromium or {}); chuck = callPackage ../applications/audio/chuck { From a479d38d7060317ecd7391167ec4ae3d31059585 Mon Sep 17 00:00:00 2001 From: Zitrone Date: Wed, 12 Jun 2024 04:33:44 +0200 Subject: [PATCH 2/4] ChowCentaur: rename to chow-centaur --- .../default.nix => by-name/ch/chow-centaur/package.nix} | 8 ++++---- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 5 insertions(+), 6 deletions(-) rename pkgs/{applications/audio/ChowCentaur/default.nix => by-name/ch/chow-centaur/package.nix} (92%) diff --git a/pkgs/applications/audio/ChowCentaur/default.nix b/pkgs/by-name/ch/chow-centaur/package.nix similarity index 92% rename from pkgs/applications/audio/ChowCentaur/default.nix rename to pkgs/by-name/ch/chow-centaur/package.nix index 80f5768dc157..87c8bc35b1b9 100644 --- a/pkgs/applications/audio/ChowCentaur/default.nix +++ b/pkgs/by-name/ch/chow-centaur/package.nix @@ -2,14 +2,14 @@ , xcbutilcursor, xcbutilkeysyms, xcbutil, libXrandr, libXinerama, libXcursor , alsa-lib, libjack2, lv2, gcc-unwrapped }: -stdenv.mkDerivation rec { - pname = "ChowCentaur"; +stdenv.mkDerivation (finalAttrs: { + pname = "chow-centaur"; version = "1.4.0"; src = fetchFromGitHub { owner = "jatinchowdhury18"; repo = "KlonCentaur"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0mrzlf4a6f25xd7z9xanpyq7ybb4al01dzpjsgi0jkmlmadyhc4h"; fetchSubmodules = true; }; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ magnetophon ]; }; -} +}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 0f466e1e076f..dc90a6efdc4b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -176,6 +176,7 @@ mapAliases ({ chia-plotter = throw "chia-plotter has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # Added 2023-11-30 chkservice = throw "chkservice has been removed from nixpkgs, as it has been deleted upstream"; # Added 2024-01-08 chocolateDoom = chocolate-doom; # Added 2023-05-01 + ChowCentaur = chow-centaur; # Added 2024-06-12 CHOWTapeModel = chow-tape-model; # Added 2024-06-12 chrome-gnome-shell = gnome-browser-connector; # Added 2022-07-27 chromiumBeta = throw "'chromiumBeta' has been removed due to the lack of maintenance in nixpkgs. Consider using 'chromium' instead."; # Added 2023-10-18 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ed24dc1f7054..45bb8065fe1e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29973,8 +29973,6 @@ with pkgs; cgif = callPackage ../tools/graphics/cgif { }; - ChowCentaur = callPackage ../applications/audio/ChowCentaur { }; - ChowKick = callPackage ../applications/audio/ChowKick { }; ChowPhaser = callPackage ../applications/audio/ChowPhaser { }; From ec6678c0f6a6129b9e7d7c45537cc3b789e47ee4 Mon Sep 17 00:00:00 2001 From: Zitrone Date: Wed, 12 Jun 2024 04:36:00 +0200 Subject: [PATCH 3/4] ChowPhaser: rename to chow-phaser --- .../default.nix => by-name/ch/chow-phaser/package.nix} | 9 +++++---- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 6 insertions(+), 6 deletions(-) rename pkgs/{applications/audio/ChowPhaser/default.nix => by-name/ch/chow-phaser/package.nix} (93%) diff --git a/pkgs/applications/audio/ChowPhaser/default.nix b/pkgs/by-name/ch/chow-phaser/package.nix similarity index 93% rename from pkgs/applications/audio/ChowPhaser/default.nix rename to pkgs/by-name/ch/chow-phaser/package.nix index a828a1e1d041..23cfe684d81f 100644 --- a/pkgs/applications/audio/ChowPhaser/default.nix +++ b/pkgs/by-name/ch/chow-phaser/package.nix @@ -4,14 +4,14 @@ , libsepol, libsysprof-capture, libthai, libxkbcommon, pcre, pkg-config , python3, sqlite, stdenv }: -stdenv.mkDerivation rec { - pname = "ChowPhaser"; +stdenv.mkDerivation (finalAttrs: { + pname = "chow-phaser"; version = "1.1.1"; src = fetchFromGitHub { owner = "jatinchowdhury18"; repo = "ChowPhaser"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; fetchSubmodules = true; sha256 = "sha256-9wo7ZFMruG3QNvlpILSvrFh/Sx6J1qnlWc8+aQyS4tQ="; }; @@ -70,7 +70,8 @@ stdenv.mkDerivation rec { homepage = "https://github.com/jatinchowdhury18/ChowPhaser"; description = "Phaser effect based loosely on the Schulte Compact Phasing 'A'"; license = with licenses; [ bsd3 ]; + mainProgram = "ChowPhaserStereo"; maintainers = with maintainers; [ magnetophon ]; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index dc90a6efdc4b..31905698c272 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -177,6 +177,7 @@ mapAliases ({ chkservice = throw "chkservice has been removed from nixpkgs, as it has been deleted upstream"; # Added 2024-01-08 chocolateDoom = chocolate-doom; # Added 2023-05-01 ChowCentaur = chow-centaur; # Added 2024-06-12 + ChowPhaser = chow-phaser; # Added 2024-06-12 CHOWTapeModel = chow-tape-model; # Added 2024-06-12 chrome-gnome-shell = gnome-browser-connector; # Added 2022-07-27 chromiumBeta = throw "'chromiumBeta' has been removed due to the lack of maintenance in nixpkgs. Consider using 'chromium' instead."; # Added 2023-10-18 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 45bb8065fe1e..a33f2715278f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29975,8 +29975,6 @@ with pkgs; ChowKick = callPackage ../applications/audio/ChowKick { }; - ChowPhaser = callPackage ../applications/audio/ChowPhaser { }; - chromium = callPackage ../applications/networking/browsers/chromium (config.chromium or {}); chuck = callPackage ../applications/audio/chuck { From 96e490fbb9ecf8e0c1911c421daa01855349a52d Mon Sep 17 00:00:00 2001 From: Zitrone Date: Wed, 12 Jun 2024 04:36:38 +0200 Subject: [PATCH 4/4] ChowKick: rename to chow-kick --- .../ch/chow-kick/package.nix} | 16 ++++++++-------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 9 insertions(+), 10 deletions(-) rename pkgs/{applications/audio/ChowKick/default.nix => by-name/ch/chow-kick/package.nix} (83%) diff --git a/pkgs/applications/audio/ChowKick/default.nix b/pkgs/by-name/ch/chow-kick/package.nix similarity index 83% rename from pkgs/applications/audio/ChowKick/default.nix rename to pkgs/by-name/ch/chow-kick/package.nix index 0eec7ea32d32..b9dec059d1f1 100644 --- a/pkgs/applications/audio/ChowKick/default.nix +++ b/pkgs/by-name/ch/chow-kick/package.nix @@ -35,14 +35,14 @@ , webkitgtk }: -stdenv.mkDerivation rec { - pname = "ChowKick"; +stdenv.mkDerivation (finalAttrs: { + pname = "chow-kick"; version = "1.1.1"; src = fetchFromGitHub { owner = "Chowdhury-DSP"; - repo = pname; - rev = "v${version}"; + repo = "ChowKick"; + rev = "v${finalAttrs.version}"; sha256 = "0amnp0p7ckbbr9dcbdnld1ryv46kvza2dj8m6hzmi7c1s4df8x5q"; fetchSubmodules = true; }; @@ -91,9 +91,9 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/lib/lv2 $out/lib/vst3 $out/bin - cp -r ChowKick_artefacts/Release/LV2//${pname}.lv2 $out/lib/lv2 - cp -r ChowKick_artefacts/Release/VST3/${pname}.vst3 $out/lib/vst3 - cp ChowKick_artefacts/Release/Standalone/${pname} $out/bin + cp -r ChowKick_artefacts/Release/LV2/ChowKick.lv2 $out/lib/lv2 + cp -r ChowKick_artefacts/Release/VST3/ChowKick.vst3 $out/lib/vst3 + cp ChowKick_artefacts/Release/Standalone/ChowKick $out/bin ''; meta = with lib; { @@ -104,4 +104,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; mainProgram = "ChowKick"; }; -} +}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 31905698c272..7058238d81bc 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -178,6 +178,7 @@ mapAliases ({ chocolateDoom = chocolate-doom; # Added 2023-05-01 ChowCentaur = chow-centaur; # Added 2024-06-12 ChowPhaser = chow-phaser; # Added 2024-06-12 + ChowKick = chow-kick; # Added 2024-06-12 CHOWTapeModel = chow-tape-model; # Added 2024-06-12 chrome-gnome-shell = gnome-browser-connector; # Added 2022-07-27 chromiumBeta = throw "'chromiumBeta' has been removed due to the lack of maintenance in nixpkgs. Consider using 'chromium' instead."; # Added 2023-10-18 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a33f2715278f..e0fd87aa56b3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29973,8 +29973,6 @@ with pkgs; cgif = callPackage ../tools/graphics/cgif { }; - ChowKick = callPackage ../applications/audio/ChowKick { }; - chromium = callPackage ../applications/networking/browsers/chromium (config.chromium or {}); chuck = callPackage ../applications/audio/chuck {