packaging: Improve name of bower components derivation

- Include the version, so that it can easier be related based on the name in the
  nix store.

- Avoid appending bower-components since this part is already added as a prefix
  by the machinery.
This commit is contained in:
Johannes Bornhold 2016-08-30 16:48:15 +02:00
parent d74f8c096f
commit 4a9375c078

View file

@ -50,6 +50,7 @@ let
!startsWith "result" path;
sources = pkgs.config.rc.sources or {};
version = builtins.readFile ./rhodecode/VERSION;
rhodecode-enterprise-ce-src = builtins.filterSource src-filter ./.;
nodeEnv = import ./pkgs/node-default.nix {
@ -58,7 +59,7 @@ let
nodeDependencies = nodeEnv.shell.nodeDependencies;
bowerComponents = pkgs.buildBowerComponents {
name = "enterprise-ce-bower-components";
name = "enterprise-ce-${version}";
generated = ./pkgs/bower-packages.nix;
src = rhodecode-enterprise-ce-src;
};
@ -82,7 +83,6 @@ let
pythonLocalOverrides = self: super: {
rhodecode-enterprise-ce =
let
version = builtins.readFile ./rhodecode/VERSION;
linkNodeAndBowerPackages = ''
echo "Link node packages"
rm -fr node_modules