rarias/bscpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nanos6: allow the git url and branch to be specified

Browse Source
This commit is contained in:
Rodrigo Arias 2021-06-02 11:35:30 +02:00
parent fb2b3cbe06
commit 11a521ff51
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
bsc/nanos6/git.nix
View File

@ -11,9 +11,12 @@
, extrae , extrae
, boost , boost
, autoreconfHook , autoreconfHook
, enableJemalloc ? false , enableJemalloc ? true
, jemalloc ? null , jemalloc ? null
, cachelineBytes ? 64 , cachelineBytes ? 64
, enableGlibcxxDebug ? false
, gitUrl ? "ssh://git@bscpm03.bsc.es/nanos6/nanos6"
, gitBranch ? "master"
}: }:
with stdenv.lib; with stdenv.lib;
@ -21,11 +24,10 @@ with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "nanos6"; pname = "nanos6";
version = "${src.shortRev}"; version = "${src.shortRev}";
branch = "master";
src = builtins.fetchGit { src = builtins.fetchGit {
url = "ssh://git@bscpm03.bsc.es/nanos6/nanos6"; url = gitUrl;
ref = branch; ref = gitBranch;
}; };
prePatch = '' prePatch = ''
@ -37,11 +39,12 @@ stdenv.mkDerivation rec {
preConfigure = '' preConfigure = ''
export CACHELINE_WIDTH=${toString cachelineBytes} export CACHELINE_WIDTH=${toString cachelineBytes}
export NANOS6_GIT_VERSION=${src.rev} export NANOS6_GIT_VERSION=${src.rev}
export NANOS6_GIT_BRANCH=${branch} export NANOS6_GIT_BRANCH=${gitBranch}
''; '';
configureFlags = [] ++ configureFlags = []
optional enableJemalloc "--with-jemalloc=${jemalloc}"; ++ (optional enableJemalloc "--with-jemalloc=${jemalloc}")
++ (optional enableGlibcxxDebug "CXXFLAGS=-D_GLIBCXX_DEBUG");
# The "bindnow" flags are incompatible with ifunc resolution mechanism. We # The "bindnow" flags are incompatible with ifunc resolution mechanism. We
# disable all by default, which includes bindnow. # disable all by default, which includes bindnow.

2
overlay.nix
View File

@ -78,10 +78,12 @@ let
nanos6 = bsc.nanos6Release; nanos6 = bsc.nanos6Release;
nanos6Release = callPackage ./bsc/nanos6/default.nix { }; nanos6Release = callPackage ./bsc/nanos6/default.nix { };
nanos6Git = callPackage ./bsc/nanos6/git.nix { }; nanos6Git = callPackage ./bsc/nanos6/git.nix { };
nanos6Debug = bsc.nanos6.overrideAttrs (old: { nanos6Debug = bsc.nanos6.overrideAttrs (old: {
dontStrip = true; dontStrip = true;
enableDebugging = true; enableDebugging = true;
}); });
nanos6GlibcxxDebug = bsc.nanos6Debug.override { nanos6GlibcxxDebug = bsc.nanos6Debug.override {
enableGlibcxxDebug = true; enableGlibcxxDebug = true;
}; };