From 4a9375c07827e6ff78a923438bbe7db554bc697f Mon Sep 17 00:00:00 2001
From: Johannes Bornhold <johannes@rhodecode.com>
Date: Tue, 30 Aug 2016 16:48:15 +0200
Subject: [PATCH] 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.
---
 default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/default.nix b/default.nix
index baad12a4..c922459d 100644
--- a/default.nix
+++ b/default.nix
@@ -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