grahamc/hydra - Change UBPWXGKFBD6VMQCCUE625I4NLLRNVD7BSJ6QD2XF7Z7A7T5BI5XAC

Move build logic for the core hydra package into its own default.nix.

This allows users to build hydra using a normal mkDerivation, package overrides, etc.

Created by Shea Levy on April 11, 2017

UBPWXGKFBD6VMQCCUE625I4NLLRNVD7BSJ6QD2XF7Z7A7T5BI5XAC

Dependencies

In channels

upstream

main

Change contents

File addition: default.nix (----------)

[16.2]

{ stdenv
, hydraSrc ? { outPath = ./.; revCount = 1234; rev = "abcdef"; }
, version ? builtins.readFile ./version + "." + toString hydraSrc.revCount + "." + hydraSrc.rev
, makeWrapper, libtool, unzip, nukeReferences, sqlite, libpqxx
, guile ? null
, perl, nix, postgresql92, perlPackages, openssh, buildEnv
, autoreconfHook, pkgconfig, topGit, mercurial, darcs, subversion, bazaar
, openssl, bzip2, libxslt, docbook_xsl, coreutils, findutils, pixz, gzip
, lzma, gnutar, git, gnused, rpm, dpkg, cdrkit, boehmgc, aws-sdk-cpp
}: assert builtins.compareVersions "6" stdenv.cc.cc.version < 1;
let perlDeps = buildEnv {
      name = "hydra-perl-deps";
      paths = with perlPackages;
        [ ModulePluggable
          CatalystActionREST
          CatalystAuthenticationStoreDBIxClass
          CatalystDevel
          CatalystDispatchTypeRegex
          CatalystPluginAccessLog
          CatalystPluginAuthorizationRoles
          CatalystPluginCaptcha
          CatalystPluginSessionStateCookie
          CatalystPluginSessionStoreFastMmap
          CatalystPluginStackTrace
          CatalystPluginUnicodeEncoding
          CatalystTraitForRequestProxyBase
          CatalystViewDownload
          CatalystViewJSON
          CatalystViewTT
          CatalystXScriptServerStarman
          CryptRandPasswd
          DBDPg
          DBDSQLite
          DataDump
          DateTime
          DigestSHA1
          EmailMIME
          EmailSender
          FileSlurp
          IOCompress
          IPCRun
          JSONXS
          LWP
          LWPProtocolHttps
          NetAmazonS3
          NetStatsd
          PadWalker
          Readonly
          SQLSplitStatement
          SetScalar
          Starman
          SysHostnameLong
          TestMore
          TextDiff
          TextTable
          XMLSimple
          nix
          nix.perl-bindings
          git
          boehmgc
          aws-sdk-cpp
        ];
    };
in stdenv.mkDerivation {
  name = "hydra-${version}";
  src = hydraSrc;
  buildInputs =
    [ makeWrapper autoreconfHook libtool unzip nukeReferences pkgconfig sqlite libpqxx
      topGit mercurial darcs subversion bazaar openssl bzip2 libxslt
      guile # optional, for Guile + Guix support
      perlDeps perl nix
      postgresql92 # for running the tests
    ];
  hydraPath = stdenv.lib.makeBinPath (
    [ sqlite subversion openssh nix coreutils findutils pixz
      gzip bzip2 lzma gnutar unzip git topGit mercurial darcs gnused bazaar
    ] ++ stdenv.lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] );
  configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ];
  preHook = ''
    PATH=$(pwd)/src/hydra-evaluator:$(pwd)/src/script:$(pwd)/src/hydra-eval-jobs:$(pwd)/src/hydra-queue-runner:$PATH
    PERL5LIB=$(pwd)/src/lib:$PERL5LIB;
  '';
  preCheck = ''
    patchShebangs .
    export LOGNAME=${LOGNAME:-foo}
  '';
  postInstall = ''
    mkdir -p $out/nix-support
    for i in $out/bin/*; do #*/
        read -n 4 chars < $i
        if [[ $chars =~ ELF ]]; then continue; fi
        wrapProgram $i \
            --prefix PERL5LIB ':' $out/libexec/hydra/lib:$PERL5LIB \
            --prefix PATH ':' $out/bin:$hydraPath \
            --set HYDRA_RELEASE ${version} \
            --set HYDRA_HOME $out/libexec/hydra \
            --set NIX_RELEASE ${nix.name or "unknown"}
    done
  '';
  dontStrip = true;
  passthru.perlDeps = perlDeps;
}

Deletion in release.nix at line 31 [18.1]

B:BD[17.532] → [17.532:533]

B:BD[17.533] → [19.316:413]


  version = builtins.readFile ./version + "." + toString hydraSrc.revCount + "." + hydraSrc.rev;

Deletion in release.nix at line 47 [18.1]

∅:D[14.43] → [20.428:429]

B:BD[20.428] → [20.428:429]

B:BD[20.429] → [14.44:55]

∅:D[14.55] → [20.429:565]

B:BD[20.429] → [20.429:565]

B:BD[20.565] → [13.0:135]

∅:D[21.135] → [20.700:1016]

∅:D[13.135] → [20.700:1016]

∅:D[22.135] → [20.700:1016]

∅:D[23.135] → [20.700:1016]

∅:D[24.135] → [20.700:1016]

∅:D[25.192] → [20.700:1016]

B:BD[20.700] → [20.700:1016]

B:BD[20.1016] → [14.56:90]

∅:D[14.90] → [26.409:410]

∅:D[20.1016] → [26.409:410]

B:BD[26.409] → [26.409:410]

∅:D[26.410] → [27.36:133]

B:BD[18.875] → [27.36:133]

B:BD[27.133] → [28.0:28]

B:BD[28.28] → [29.0:31]

∅:D[29.31] → [28.28:77]

B:BD[28.28] → [28.28:77]

B:BD[28.77] → [29.32:58]

∅:D[29.58] → [30.0:38]

B:BD[28.77] → [30.0:38]

∅:D[30.38] → [27.182:426]

∅:D[28.77] → [27.182:426]

B:BD[27.182] → [27.182:426]

B:BD[27.426] → [2.0:42]

∅:D[2.42] → [30.39:84]

B:BD[27.426] → [30.39:84]

∅:D[30.84] → [27.426:556]

B:BD[27.426] → [27.426:556]

∅:D[6.21] → [27.601:734]

∅:D[31.31] → [27.601:734]

B:BD[27.601] → [27.601:734]

B:BD[27.734] → [4.0:22]

∅:D[4.22] → [27.734:780]

B:BD[27.734] → [27.734:780]

∅:D[32.45] → [27.780:841]

B:BD[27.780] → [27.780:841]

B:BD[27.841] → [29.59:128]

B:BD[29.128] → [26.411:433]

∅:D[29.128] → [27.841:863]

∅:D[26.433] → [27.841:863]

B:BD[27.841] → [27.841:863]

B:BD[27.889] → [27.889:910]

∅:D[33.22] → [27.910:940]

B:BD[27.910] → [27.910:940]

B:BD[27.940] → [29.129:151]

∅:D[29.151] → [27.940:960]

B:BD[27.940] → [27.940:960]

B:BD[27.1031] → [27.1031:1059]

∅:D[29.176] → [27.1059:1145]

B:BD[27.1059] → [27.1059:1145]

B:BD[27.1145] → [15.0:107]

∅:D[15.107] → [27.1165:1187]

∅:D[19.443] → [27.1165:1187]

∅:D[20.1058] → [27.1165:1187]

B:BD[27.1165] → [27.1165:1187]


        /*
      nix = overrideDerivation nixUnstable (attrs: {
        src = fetchFromGitHub {
          owner = "NixOS";
          repo = "nix";
          rev = "4be4f6de56f4de77f6a376f1a40ed75eb641bb89";
          sha256 = "0icvbwpca1jh8qkdlayxspdxl5fb0qjjd1kn74x6gs6iy66kndq6";
        };
        buildInputs = attrs.buildInputs ++ [ autoreconfHook bison flex ];
        nativeBuildInputs = attrs.nativeBuildInputs ++ [ aws-sdk-cpp' autoconf-archive ];
        configureFlags = attrs.configureFlags + " --disable-doc-gen";
        preConfigure = "./bootstrap.sh; mkdir -p $doc $man";
      });
      */
      nix = nixUnstable;
      perlDeps = buildEnv {
        name = "hydra-perl-deps";
        paths = with perlPackages;
          [ ModulePluggable
            CatalystActionREST
            CatalystAuthenticationStoreDBIxClass
            CatalystDevel
            CatalystDispatchTypeRegex
            CatalystPluginAccessLog
            CatalystPluginAuthorizationRoles
            CatalystPluginCaptcha
            CatalystPluginSessionStateCookie
            CatalystPluginSessionStoreFastMmap
            CatalystPluginStackTrace
            CatalystPluginUnicodeEncoding
            CatalystTraitForRequestProxyBase
            CatalystViewDownload
            CatalystViewJSON
            CatalystViewTT
            CatalystXScriptServerStarman
            CryptRandPasswd
            DBDPg
            DBDSQLite
            DataDump
            DateTime
            DigestSHA1
            EmailMIME
            EmailSender
            FileSlurp
            IOCompress
            IPCRun
            JSONXS
            LWP
            LWPProtocolHttps
            NetAmazonS3
            NetStatsd
            PadWalker
            Readonly
            SQLSplitStatement
            SetScalar
            Starman
            SysHostnameLong
            TestMore
            TextDiff
            TextTable
            XMLSimple
            nix
            nix.perl-bindings
            git
            boehmgc
            aws-sdk-cpp'
          ];
      };

Insertion in release.nix at line 48 [18.1]
[27.1188]
[27.1188]
```
      stdenv6 = overrideCC stdenv gcc6;
```

Replacement in release.nix at line 51 [18.1]

B:BD[34.185] → [35.14:42]

B:BD[35.42] → [9.0:33]

∅:D[9.33] → [19.444:445]

B:BD[36.22] → [19.444:445]

B:BD[19.445] → [7.17:63]

∅:D[37.32] → [18.925:926]

∅:D[7.63] → [18.925:926]

∅:D[35.109] → [18.925:926]

∅:D[34.253] → [18.925:926]

∅:D[38.460] → [18.925:926]

∅:D[19.500] → [18.925:926]

∅:D[39.1759] → [18.925:926]

B:BD[18.925] → [18.925:926]

B:BD[18.926] → [25.193:233]

∅:D[25.233] → [39.1760:1780]

B:BD[18.926] → [39.1760:1780]

B:BD[39.1780] → [19.501:680]

∅:D[40.77] → [27.1343:1396]

∅:D[19.680] → [27.1343:1396]

B:BD[27.1343] → [27.1343:1396]

B:BD[27.1396] → [10.0:28]

∅:D[10.28] → [41.0:47]

B:BD[28.102] → [41.0:47]

∅:D[41.47] → [27.1420:1431]

∅:D[28.102] → [27.1420:1431]

∅:D[42.118] → [27.1420:1431]

∅:D[43.325] → [27.1420:1431]

B:BD[27.1420] → [27.1420:1431]

∅:D[44.11] → [18.1304:1305]

∅:D[45.302] → [18.1304:1305]

∅:D[46.725] → [18.1304:1305]

∅:D[27.1431] → [18.1304:1305]

∅:D[39.1952] → [18.1304:1305]

B:BD[18.1304] → [18.1304:1305]

B:BD[18.1305] → [47.0:36]

B:BD[47.36] → [12.0:65]

∅:D[12.65] → [48.0:92]

∅:D[49.105] → [48.0:92]

B:BD[45.416] → [48.0:92]

∅:D[48.92] → [45.511:576]

∅:D[40.179] → [45.511:576]

B:BD[45.511] → [45.511:576]

∅:D[45.576] → [50.74:75]

B:BD[39.2226] → [50.74:75]

B:BD[50.75] → [7.64:110]

∅:D[7.110] → [19.703:757]

B:BD[19.703] → [19.703:757]

B:BD[19.757] → [7.111:196]

∅:D[7.196] → [19.895:987]

B:BD[19.895] → [19.895:987]

B:BD[19.987] → [51.0:19]

B:BD[51.19] → [24.136:257]

∅:D[24.257] → [51.113:167]

B:BD[51.113] → [51.113:167]

∅:D[51.167] → [19.987:1066]

B:BD[19.987] → [19.987:1066]

∅:D[19.1066] → [52.0:93]

B:BD[50.75] → [52.0:93]

∅:D[52.93] → [18.1400:1401]

∅:D[50.115] → [18.1400:1401]

∅:D[53.210] → [18.1400:1401]

∅:D[54.411] → [18.1400:1401]

∅:D[39.2226] → [18.1400:1401]

B:BD[18.1400] → [18.1400:1401]

B:BD[18.1401] → [35.166:189]

B:BD[35.189] → [45.577:611]

∅:D[55.100] → [53.531:532]

∅:D[56.147] → [53.531:532]

∅:D[57.223] → [53.531:532]

∅:D[34.425] → [53.531:532]

∅:D[39.2601] → [53.531:532]

B:BD[53.531] → [53.531:532]

B:BD[18.1557] → [39.2693:2725]

B:BD[39.2725] → [8.0:87]

∅:D[8.87] → [39.2725:2883]

∅:D[5.110] → [39.2725:2883]

B:BD[39.2725] → [39.2725:2883]

B:BD[39.2883] → [19.1067:1116]

∅:D[19.1116] → [58.0:54]

B:BD[39.2994] → [58.0:54]

B:BD[58.54] → [3.0:59]

∅:D[3.59] → [39.3040:3053]

B:BD[39.3040] → [39.3040:3053]

∅:D[59.133] → [39.3389:3404]

B:BD[39.3389] → [39.3389:3404]

B:BD[39.3404] → [60.0:1]

B:BD[60.1] → [8.88:112]

∅:D[60.33] → [61.209:210]

∅:D[8.112] → [61.209:210]

B:BD[39.3404] → [61.209:210]

B:BD[61.212] → [45.612:668]

B:BD[45.668] → [62.25:61]

    releaseTools.nixBuild {
      name = "hydra-${version}";
      src = if shell then null else hydraSrc;
      stdenv = overrideCC stdenv gcc6;
      buildInputs =
        [ makeWrapper autoconf automake libtool unzip nukeReferences pkgconfig sqlite libpqxx
          gitAndTools.topGit mercurial darcs subversion bazaar openssl bzip2 libxslt
          guile # optional, for Guile + Guix support
          perlDeps perl nix
          postgresql92 # for running the tests
        ];
      hydraPath = lib.makeBinPath (
        [ sqlite subversion openssh nix coreutils findutils pixz
          gzip bzip2 lzma gnutar unzip git gitAndTools.topGit mercurial darcs gnused bazaar
        ] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] );
      postUnpack = optionalString (!shell) ''
        # Clean up when building from a working tree.
        (cd $sourceRoot && (git ls-files -o --directory | xargs -r rm -rfv)) || true
      '';
      configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ];
      preHook = ''
        PATH=$(pwd)/src/hydra-evaluator:$(pwd)/src/script:$(pwd)/src/hydra-eval-jobs:$(pwd)/src/hydra-queue-runner:$PATH
        PERL5LIB=$(pwd)/src/lib:$PERL5LIB;
      '';
      preConfigure = "autoreconf -vfi";
      enableParallelBuilding = true;
      preCheck = ''
        patchShebangs .
        export LOGNAME=${LOGNAME:-foo}
      '';
      postInstall = ''
        mkdir -p $out/nix-support
        for i in $out/bin/*; do
            read -n 4 chars < $i
            if [[ $chars =~ ELF ]]; then continue; fi
            wrapProgram $i \
                --prefix PERL5LIB ':' $out/libexec/hydra/lib:$PERL5LIB \
                --prefix PATH ':' $out/bin:$hydraPath \
                --set HYDRA_RELEASE ${version} \
                --set HYDRA_HOME $out/libexec/hydra \
                --set NIX_RELEASE ${nix.name or "unknown"}
        done
      ''; # */
      dontStrip = true;
      meta.description = "Build of Hydra on ${system}";
      passthru.perlDeps = perlDeps;

[34.185]

[63.192]

    callPackage ./. {
      stdenv = stdenv6 // { mkDerivation = args: releaseTools.nixBuild (args // {
        stdenv = stdenv6;
        postUnpack = optionalString (!shell) ''
          # Clean up when building from a working tree.
          (cd $sourceRoot && (git ls-files -o --directory | xargs -r rm -rfv)) || true
        '';
      }); };
      inherit (gitAndTools) topGit;
      nix = nixUnstable;
      aws-sdk-cpp = aws-sdk-cpp';
      hydraSrc = if shell then null else hydraSrc;

Replacement in release.nix at line 65 [18.1]

B:BD[64.1] → [64.1:54]

  manual = pkgs.runCommand "hydra-manual-${version}"

[64.1]

[11.0]

  manual = pkgs.runCommand "hydra-manual-${build.x86_64-linux.version}"