From 4c61914b91986a1774ebd3743d56d12f2071e207 Mon Sep 17 00:00:00 2001 From: Yusuf Bera Ertan Date: Fri, 11 Dec 2020 17:50:06 +0300 Subject: [PATCH] nix: remove version from package names --- nix/veloren.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/nix/veloren.nix b/nix/veloren.nix index e15852148e..7447e639a9 100644 --- a/nix/veloren.nix +++ b/nix/veloren.nix @@ -52,9 +52,6 @@ let if tag != "" then tag else if prettyRev != "" then prettyRev else throw "Need a tag or at least revision + lastModified in order to determine version"; - # Sanitize version string since it might contain illegal characters for a Nix store path - # Used in the derivation(s) name - sanitizedVersion = pkgs.stdenv.lib.strings.sanitizeDerivationName version; veloren-assets = pkgs.runCommand "makeAssetsDir" { } '' mkdir $out @@ -88,7 +85,7 @@ let NIX_GIT_TAG = tag; }; veloren-server-cli = _: { - name = "veloren-server-cli_${sanitizedVersion}"; + name = "veloren-server-cli"; inherit version; VELOREN_USERDATA_STRATEGY = "system"; nativeBuildInputs = [ makeWrapper ]; @@ -103,7 +100,7 @@ let }; }; veloren-voxygen = _: { - name = "veloren-voxygen_${sanitizedVersion}"; + name = "veloren-voxygen"; inherit version; VELOREN_USERDATA_STRATEGY = "system"; inherit (crateDeps.veloren-voxygen) buildInputs;