##// END OF EJS Templates
git: use force fetch and update for target ref. This solves a case...
git: use force fetch and update for target ref. This solves a case when in PRs a target is force updated and is out of sync. Before we used a pull which --ff-only fails obviosly because two are out of sync. This change uses new logic that resets the target branch according to the source target branch allowing smooth merge simulation.

File last commit:

r2761:cdb0bfef default
r2784:e8c62649 default
Show More
default.nix
243 lines | 7.5 KiB | text/x-nix | NixLexer
project: added all source files and assets
r1 # Nix environment for the community edition
#
# This shall be as lean as possible, just producing the Enterprise
# derivation. For advanced tweaks to pimp up the development environment we use
# "shell.nix" so that it does not have to clutter this file.
Martin Bornhold
nix: Pass the backwards compatible fetchgit to python and node packages.
r926 args@
{ pythonPackages ? "python27Packages"
project: added all source files and assets
r1 , pythonExternalOverrides ? self: super: {}
, doCheck ? true
Martin Bornhold
nix: Pass the backwards compatible fetchgit to python and node packages.
r926 , ...
project: added all source files and assets
r1 }:
let
Martin Bornhold
nix: Pass the backwards compatible fetchgit to python and node packages.
r926
# Use nixpkgs from args or import them. We use this indirect approach
# through args to be able to use the name `pkgs` for our customized packages.
# Otherwise we will end up with an infinite recursion.
nixpkgs = args.pkgs or (import <nixpkgs> { });
# johbo: Interim bridge which allows us to build with the upcoming
# nixos.16.09 branch (unstable at the moment of writing this note) and the
# current stable nixos-16.03.
backwardsCompatibleFetchgit = { ... }@args:
let
origSources = nixpkgs.fetchgit args;
in
nixpkgs.lib.overrideDerivation origSources (oldAttrs: {
NIX_PREFETCH_GIT_CHECKOUT_HOOK = ''
find $out -name '.git*' -print0 | xargs -0 rm -rf
'';
});
# Create a customized version of nixpkgs which should be used throughout the
# rest of this file.
pkgs = nixpkgs.overridePackages (self: super: {
fetchgit = backwardsCompatibleFetchgit;
});
# Evaluates to the last segment of a file system path.
basename = path: with pkgs.lib; last (splitString "/" path);
# source code filter used as arugment to builtins.filterSource.
src-filter = path: type: with pkgs.lib;
let
ext = last (splitString "." path);
in
!builtins.elem (basename path) [
".git" ".hg" "__pycache__" ".eggs"
"bower_components" "node_modules"
"build" "data" "result" "tmp"] &&
!builtins.elem ext ["egg-info" "pyc"] &&
# TODO: johbo: This check is wrong, since "path" contains an absolute path,
# it would still be good to restore it since we want to ignore "result-*".
!hasPrefix "result" path;
project: added all source files and assets
r1
basePythonPackages = with builtins; if isAttrs pythonPackages
then pythonPackages
else getAttr pythonPackages pkgs;
packaging: Backport bower support utilities...
r725 buildBowerComponents =
pkgs.buildBowerComponents or
(import ./pkgs/backport-16.03-build-bower-components.nix { inherit pkgs; });
Martin Bornhold
nix: Use path to rc_testdata from pkgs.config.rc.sources if present.
r211 sources = pkgs.config.rc.sources or {};
packaging: Improve name of bower components derivation...
r724 version = builtins.readFile ./rhodecode/VERSION;
project: added all source files and assets
r1 rhodecode-enterprise-ce-src = builtins.filterSource src-filter ./.;
nix: Link node modules based on node2nix
r708 nodeEnv = import ./pkgs/node-default.nix {
inherit pkgs;
project: added all source files and assets
r1 };
nix: Link node modules based on node2nix
r708 nodeDependencies = nodeEnv.shell.nodeDependencies;
project: added all source files and assets
r1
packaging: Backport bower support utilities...
r725 bowerComponents = buildBowerComponents {
packaging: Improve name of bower components derivation...
r724 name = "enterprise-ce-${version}";
dependencies: Update bower packages...
r719 generated = ./pkgs/bower-packages.nix;
src = rhodecode-enterprise-ce-src;
};
project: added all source files and assets
r1 pythonGeneratedPackages = self: basePythonPackages.override (a: {
inherit self;
})
// (scopedImport {
self = self;
super = basePythonPackages;
inherit pkgs;
inherit (pkgs) fetchurl fetchgit;
} ./pkgs/python-packages.nix);
pythonOverrides = import ./pkgs/python-packages-overrides.nix {
inherit
basePythonPackages
pkgs;
};
pythonLocalOverrides = self: super: {
rhodecode-enterprise-ce =
let
packaging: Link bower packages
r720 linkNodeAndBowerPackages = ''
nix: export CE sources path
r743 echo "Export RhodeCode CE path"
export RHODECODE_CE_PATH=${rhodecode-enterprise-ce-src}
project: added all source files and assets
r1 echo "Link node packages"
rm -fr node_modules
nix: Link node modules based on node2nix
r708 mkdir node_modules
# johbo: Linking individual packages allows us to run "npm install"
# inside of a shell to try things out. Re-entering the shell will
# restore a clean environment.
ln -s ${nodeDependencies}/lib/node_modules/* node_modules/
project: added all source files and assets
r1 echo "DONE: Link node packages"
packaging: Link bower packages
r720
echo "Link bower packages"
rm -fr bower_components
mkdir bower_components
ln -s ${bowerComponents}/bower_components/* bower_components/
echo "DONE: Link bower packages"
project: added all source files and assets
r1 '';
in super.rhodecode-enterprise-ce.override (attrs: {
release: Provide attribute releaseName...
r241 inherit
doCheck
version;
project: added all source files and assets
r1 name = "rhodecode-enterprise-ce-${version}";
release: Provide attribute releaseName...
r241 releaseName = "RhodeCodeEnterpriseCE-${version}";
project: added all source files and assets
r1 src = rhodecode-enterprise-ce-src;
packaging: don't run strip on sources for python packages
r1493 dontStrip = true; # prevent strip, we don't need it.
project: added all source files and assets
r1
buildInputs =
attrs.buildInputs ++
(with self; [
dependencies: Adding Bower out of nixpkgs...
r709 pkgs.nodePackages.bower
project: added all source files and assets
r1 pkgs.nodePackages.grunt-cli
pkgs.subversion
Martin Bornhold
nix: Import rhodecode testdata as derivation.
r218 rhodecode-testdata
project: added all source files and assets
r1 ]);
requirements: updated structure of requirement files, and re-generated nix files.
r1236 #TODO: either move this into overrides, OR use the new machanics from
# pip2nix and requiremtn.txt file
project: added all source files and assets
r1 propagatedBuildInputs = attrs.propagatedBuildInputs ++ (with self; [
rhodecode-tools
]);
# TODO: johbo: Make a nicer way to expose the parts. Maybe
# pkgs/default.nix?
passthru = {
packaging: Expose the local overrides via passthru.
r74 inherit
dependencies: Update bower packages...
r719 bowerComponents
packaging: Link bower packages
r720 linkNodeAndBowerPackages
nix: Add linkNodeModules to passthru...
r465 myPythonPackagesUnfix
pythonLocalOverrides;
project: added all source files and assets
r1 pythonPackages = self;
};
LC_ALL = "en_US.UTF-8";
LOCALE_ARCHIVE =
if pkgs.stdenv ? glibc
then "${pkgs.glibcLocales}/lib/locale/locale-archive"
else "";
preCheck = ''
export PATH="$out/bin:$PATH"
'';
postCheck = ''
rm -rf $out/lib/${self.python.libPrefix}/site-packages/pytest_pylons
rm -rf $out/lib/${self.python.libPrefix}/site-packages/rhodecode/tests
'';
packaging: Link bower packages
r720 preBuild = linkNodeAndBowerPackages + ''
project: added all source files and assets
r1 grunt
rm -fr node_modules
'';
postInstall = ''
nix: update default.nix to be consistent with ordering with vcsserver.
r1773 echo "Writing meta information for rccontrol to nix-support/rccontrol"
mkdir -p $out/nix-support/rccontrol
cp -v rhodecode/VERSION $out/nix-support/rccontrol/version
echo "DONE: Meta information for rccontrol written"
project: added all source files and assets
r1 # python based programs need to be wrapped
nix: added python link for building wrapped python....
r2730 #ln -s ${self.python}/bin/* $out/bin/
nix: update default.nix to be consistent with ordering with vcsserver.
r1773 ln -s ${self.pyramid}/bin/* $out/bin/
ln -s ${self.gunicorn}/bin/gunicorn $out/bin/
project: added all source files and assets
r1 ln -s ${self.supervisor}/bin/supervisor* $out/bin/
dependencies: made all dependencies lowercase, helps with diffing other projects, and keeps proper order.
r2718 ln -s ${self.pastescript}/bin/paster $out/bin/
notifications: support real-time notifications with websockets via channelstream
r526 ln -s ${self.channelstream}/bin/channelstream $out/bin/
nix: expose celery binaries
r2377 ln -s ${self.celery}/bin/celery $out/bin/
project: added all source files and assets
r1
# rhodecode-tools
ln -s ${self.rhodecode-tools}/bin/rhodecode-* $out/bin/
# note that condition should be restricted when adding further tools
nix: update default.nix to be consistent with ordering with vcsserver.
r1773 for file in $out/bin/*;
do
project: added all source files and assets
r1 wrapProgram $file \
nix: update default.nix to be consistent with ordering with vcsserver.
r1773 --prefix PATH : $PATH \
project: added all source files and assets
r1 --prefix PYTHONPATH : $PYTHONPATH \
--set PYTHONHASHSEED random
done
mkdir $out/etc
cp configs/production.ini $out/etc
# TODO: johbo: Make part of ac-tests
if [ ! -f rhodecode/public/js/scripts.js ]; then
echo "Missing scripts.js"
exit 1
fi
if [ ! -f rhodecode/public/css/style.css ]; then
echo "Missing style.css"
exit 1
fi
'';
});
Martin Bornhold
nix: Import rhodecode testdata as derivation.
r218 rhodecode-testdata = import "${rhodecode-testdata-src}/default.nix" {
inherit
doCheck
pkgs
pythonPackages;
project: added all source files and assets
r1 };
};
Martin Bornhold
nix: Use path to rc_testdata from pkgs.config.rc.sources if present.
r211 rhodecode-testdata-src = sources.rhodecode-testdata or (
pkgs.fetchhg {
url = "https://code.rhodecode.com/upstream/rc_testdata";
largefiles: enabled download of largefiles for git and mercurial from web interface....
r1577 rev = "v0.10.0";
sha256 = "0zn9swwvx4vgw4qn8q3ri26vvzgrxn15x6xnjrysi1bwmz01qjl0";
Martin Bornhold
nix: Use path to rc_testdata from pkgs.config.rc.sources if present.
r211 });
project: added all source files and assets
r1 # Apply all overrides and fix the final package set
Martin Bornhold
nix: Pass the backwards compatible fetchgit to python and node packages.
r926 myPythonPackagesUnfix = with pkgs.lib;
project: added all source files and assets
r1 (extends pythonExternalOverrides
(extends pythonLocalOverrides
(extends pythonOverrides
pythonGeneratedPackages)));
Martin Bornhold
nix: Pass the backwards compatible fetchgit to python and node packages.
r926 myPythonPackages = (pkgs.lib.fix myPythonPackagesUnfix);
project: added all source files and assets
r1
in myPythonPackages.rhodecode-enterprise-ce