commit 320313a4b98ac0cbd6e1fe2bfcee73b78d17360c parent a6c517052bc9110a898b72b8363c4569ee313d7a Author: Nikolay Korotkiy <sikmir@gmail.com> Date: Thu, 26 Nov 2020 04:00:36 +0300 Fix names Diffstat:
13 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/pkgs/applications/anki/bin.nix b/pkgs/applications/anki/bin.nix @@ -1,7 +1,7 @@ { stdenv, fetchfromgh, undmg }: stdenv.mkDerivation rec { - pname = "anki"; + pname = "anki-bin"; version = "2.1.35"; src = fetchfromgh { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/Applications/Anki.app - cp -R . $out/Applications/Anki.app + cp -r . $out/Applications/Anki.app ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/gis/qgis/bin.nix b/pkgs/applications/gis/qgis/bin.nix @@ -3,7 +3,7 @@ assert stdenv.lib.assertOneOf "releaseType" releaseType [ "pr" "ltr" ]; stdenv.mkDerivation rec { - pname = "qgis"; + pname = "qgis-bin"; version = { pr = "3.14.16"; ltr = "3.10.10"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/Applications/QGIS.app - cp -R . $out/Applications/QGIS.app + cp -r . $out/Applications/QGIS.app ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/gis/qmapshack/bin.nix b/pkgs/applications/gis/qmapshack/bin.nix @@ -1,7 +1,7 @@ { stdenv, fetchfromgh, unzip }: stdenv.mkDerivation rec { - pname = "qmapshack"; + pname = "qmapshack-bin"; version = "1.15.0"; src = fetchfromgh { diff --git a/pkgs/applications/goldencheetah/bin.nix b/pkgs/applications/goldencheetah/bin.nix @@ -3,7 +3,7 @@ let inherit (stdenv.hostPlatform) system; throwSystem = throw "Unsupported system: ${system}"; - pname = "goldencheetah"; + pname = "goldencheetah-bin"; version = "3.5"; name = "${pname}-${version}"; @@ -55,7 +55,7 @@ let installPhase = '' mkdir -p $out/Applications/GoldenCheetah.app - cp -R . $out/Applications/GoldenCheetah.app + cp -r . $out/Applications/GoldenCheetah.app ''; }; in diff --git a/pkgs/applications/goldendict/bin.nix b/pkgs/applications/goldendict/bin.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, undmg }: stdenv.mkDerivation rec { - pname = "goldendict"; + pname = "goldendict-bin"; version = "1.5.0-RC2-372-gc3ff15f"; src = fetchurl { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/Applications/GoldenDict.app - cp -R . $out/Applications/GoldenDict.app + cp -r . $out/Applications/GoldenDict.app ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/i18n-editor/default.nix b/pkgs/applications/i18n-editor/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchfromgh, unzip, jre, makeWrapper }: stdenv.mkDerivation rec { - pname = "i18n-editor"; + pname = "i18n-editor-bin"; version = "2.0.0-beta.1"; src = fetchfromgh { diff --git a/pkgs/applications/iterm2/bin.nix b/pkgs/applications/iterm2/bin.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - pname = "iterm2"; + pname = "iterm2-bin"; version = "3.3.12"; src = fetchurl { diff --git a/pkgs/applications/macpass/bin.nix b/pkgs/applications/macpass/bin.nix @@ -1,7 +1,7 @@ { stdenv, fetchfromgh, unzip }: stdenv.mkDerivation rec { - pname = "MacPass"; + pname = "MacPass-bin"; version = "0.7.12"; src = fetchfromgh { diff --git a/pkgs/applications/misc/klogg/bin.nix b/pkgs/applications/misc/klogg/bin.nix @@ -1,7 +1,7 @@ { stdenv, fetchfromgh, undmg, sources }: stdenv.mkDerivation rec { - pname = "klogg"; + pname = "klogg-bin"; version = "20.4"; src = fetchfromgh { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/Applications/klogg.app - cp -R . $out/Applications/klogg.app + cp -r . $out/Applications/klogg.app ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/qutebrowser/bin.nix b/pkgs/applications/networking/qutebrowser/bin.nix @@ -1,7 +1,7 @@ { stdenv, fetchfromgh, undmg }: stdenv.mkDerivation rec { - pname = "qutebrowser"; + pname = "qutebrowser-bin"; version = "1.14.0"; src = fetchfromgh { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/Applications/qutebrowser.app - cp -R . $out/Applications/qutebrowser.app + cp -r . $out/Applications/qutebrowser.app ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/window-managers/amethyst/bin.nix b/pkgs/applications/window-managers/amethyst/bin.nix @@ -1,7 +1,7 @@ { stdenv, fetchfromgh, unzip }: stdenv.mkDerivation rec { - pname = "Amethyst"; + pname = "Amethyst-bin"; version = "0.15.4"; src = fetchfromgh { diff --git a/pkgs/applications/wireguard-statusbar/default.nix b/pkgs/applications/wireguard-statusbar/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchfromgh, undmg }: stdenv.mkDerivation rec { - pname = "wireguard-statusbar"; + pname = "wireguard-statusbar-bin"; version = "1.24"; src = fetchfromgh { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/Applications/WireGuardStatusbar.app - cp -R . $out/Applications/WireGuardStatusbar.app + cp -r . $out/Applications/WireGuardStatusbar.app ''; meta = with stdenv.lib; { diff --git a/pkgs/default.nix b/pkgs/default.nix @@ -20,7 +20,7 @@ lib.makeScope newScope ( inherit sources; }; gpxsee-bin = callPackage ./applications/gpxsee/bin.nix { }; - i18n-editor = callPackage ./applications/i18n-editor { jre = pkgs.jdk11; }; + i18n-editor-bin = callPackage ./applications/i18n-editor { jre = pkgs.jdk11; }; iterm2-bin = callPackage ./applications/iterm2/bin.nix { }; klogg = libsForQt5.callPackage ./applications/misc/klogg { inherit sources; @@ -45,7 +45,7 @@ lib.makeScope newScope ( sasplanet = callPackage ./applications/gis/sasplanet { }; tdh = callPackage ./applications/gis/tdh { }; visualgps = libsForQt5.callPackage ./applications/visualgps { }; - wireguard-statusbar = callPackage ./applications/wireguard-statusbar { }; + wireguard-statusbar-bin = callPackage ./applications/wireguard-statusbar { }; yabai = callPackage ./applications/window-managers/yabai { inherit (darwin.apple_sdk.frameworks) Cocoa ScriptingBridge; };