grahamc/hydra - Change YQWH4POV22KYCCKOTZXD36QKUOWEQ2DSPYPO5DNZDZ344RI25OAAC

* Simplify.

Created by Eelco Dolstra on March 5, 2010

YQWH4POV22KYCCKOTZXD36QKUOWEQ2DSPYPO5DNZDZ344RI25OAAC

Dependencies

In channels

upstream

main

Change contents

Replacement in release.nix at line 1 [9.1]

B:BD[9.1] → [9.2:6]

let

[9.1]

[9.6]

{ nixpkgs ? ../nixpkgs
, hydraSrc ? {outPath = ./.; rev = 1234;}
, officialRelease ? false
}:

Replacement in release.nix at line 7 [9.1]
B:BD[9.8] → [9.8:23]
```
  jobs = rec {
```
[9.8]
[9.23]
```
rec {
```
Insertion in release.nix at line 9 [9.1]
[9.24]
[9.24]
```
  tarball =
    with import nixpkgs {};
```

Replacement in release.nix at line 12 [9.1]

B:BD[9.25] → [9.25:39]

B:BD[9.39] → [10.0:48]

B:BD[10.48] → [8.338:367]

∅:D[11.32] → [9.123:164]

∅:D[10.77] → [9.123:164]

∅:D[8.367] → [9.123:164]

B:BD[9.123] → [9.123:164]

    tarball =
      { hydraSrc ? {outPath = ./.; rev = 1234;}
      , nixpkgs ? ../nixpkgs
      , officialRelease ? false
      }:

[9.25]

[9.164]

    releaseTools.makeSourceTarball {
      name = "hydra-tarball";
      version = "0.1";
      src = hydraSrc;
      inherit officialRelease;

Replacement in release.nix at line 18 [9.1]
B:BD[9.165] → [10.78:108]
```
      with import nixpkgs {};
```
[9.165]
[9.200]
```
      buildInputs = [zip unzip];
```

Replacement in release.nix at line 20 [9.1]

B:BD[9.201] → [9.201:272]

B:BD[9.272] → [12.0:25]

∅:D[12.25] → [9.272:329]

B:BD[9.272] → [9.272:329]

      releaseTools.makeSourceTarball {
        name = "hydra-tarball";
        version = "0.1";
        src = hydraSrc;
        inherit officialRelease;

[9.201]

[13.0]

      jquery = fetchurl {
        url = http://jqueryui.com/download/jquery-ui-1.7.2.custom.zip;
        sha256 = "1l9dwaaqvdysmzlkg1vb8j0s0xn63d475gh53pjjwxw85668krdh";
      };

Replacement in release.nix at line 25 [9.1]

B:BD[13.1] → [13.1:36]

        buildInputs = [zip unzip];

[13.1]

[13.36]

      tablesorter = fetchurl {
        url = http://tablesorter.com/jquery.tablesorter.zip;
        sha256 = "013zgglvifvy0yg0ybjrl823sswy9v1ihf5nmighmcyigfd6nrhb";
      };

Replacement in release.nix at line 30 [9.1]

B:BD[13.37] → [13.37:65]

B:BD[13.65] → [14.0:148]

∅:D[14.148] → [13.201:212]

B:BD[13.201] → [13.201:212]

        jquery = fetchurl {
          url = http://jqueryui.com/download/jquery-ui-1.7.2.custom.zip;
          sha256 = "1l9dwaaqvdysmzlkg1vb8j0s0xn63d475gh53pjjwxw85668krdh";
        };

[13.37]

[9.329]

      flot = fetchurl {
        url = http://flot.googlecode.com/files/flot-0.6.zip;
        sha256 = "1k2mfijvr1jwga65wcd78lp9ia17v99f1cfm5nlmc0k8glllbj5a";
      };

Replacement in release.nix at line 35 [9.1]

B:BD[9.330] → [13.213:384]

B:BD[13.384] → [6.0:11]

        tablesorter = fetchurl {
          url = http://tablesorter.com/jquery.tablesorter.zip;
          sha256 = "013zgglvifvy0yg0ybjrl823sswy9v1ihf5nmighmcyigfd6nrhb";
        };

[9.330]

[6.11]

      # Since we don't have a `make dist', just tar everything.
      distPhase = ''
        ensureDir src/root/static/js/jquery
        unzip -d src/root/static/js/jquery $jquery
        rm -rf src/root/static/js/tablesorter
        unzip -d src/root/static/js $tablesorter
        unzip -d src/root/static/js $flot

Replacement in release.nix at line 43 [9.1]

B:BD[6.12] → [6.12:176]

∅:D[6.176] → [13.384:395]

B:BD[13.384] → [13.384:395]

        flot = fetchurl {
          url = http://flot.googlecode.com/files/flot-0.6.zip;
          sha256 = "1k2mfijvr1jwga65wcd78lp9ia17v99f1cfm5nlmc0k8glllbj5a";
        };

[6.12]

[13.395]

        make -C src/sql

Replacement in release.nix at line 45 [9.1]

∅:D[13.396] → [9.330:419]

B:BD[9.330] → [9.330:419]

B:BD[9.419] → [14.149:248]

∅:D[14.248] → [15.0:48]

B:BD[16.55] → [15.0:48]

∅:D[15.48] → [16.55:106]

B:BD[16.55] → [16.55:106]

B:BD[16.106] → [6.177:221]

        # Since we don't have a `make dist', just tar everything.
        distPhase = ''
          ensureDir src/root/static/js/jquery
          unzip -d src/root/static/js/jquery $jquery
          rm -rf src/root/static/js/tablesorter
          unzip -d src/root/static/js $tablesorter
          unzip -d src/root/static/js $flot

[13.396]

[17.33]

        releaseName=hydra-0.1$VERSION_SUFFIX;
        ensureDir $out/tarballs
        mkdir ../$releaseName
        cp -prd . ../$releaseName
        cd ..
        tar cfj $out/tarballs/$releaseName.tar.bz2 $releaseName
        tar cfz $out/tarballs/$releaseName.tar.gz $releaseName
        zip -9r $out/tarballs/$releaseName.zip $releaseName
      '';
    };

Replacement in release.nix at line 57 [9.1]

B:BD[17.34] → [17.34:60]

∅:D[17.60] → [13.515:524]

∅:D[16.106] → [13.515:524]

B:BD[13.515] → [13.515:524]

∅:D[13.524] → [9.419:716]

B:BD[9.419] → [9.419:716]

B:BD[9.716] → [13.525:587]

∅:D[13.587] → [9.716:737]

B:BD[9.716] → [9.716:737]

          make -C src/sql
        
          releaseName=hydra-0.1$VERSION_SUFFIX;
          ensureDir $out/tarballs
          mkdir ../$releaseName
          cp -prd . ../$releaseName
          cd ..
          tar cfj $out/tarballs/$releaseName.tar.bz2 $releaseName
          tar cfz $out/tarballs/$releaseName.tar.gz $releaseName
          zip -9r $out/tarballs/$releaseName.zip $releaseName
        '';
      };

[17.34]

[9.737]

  build = 
    { system ? "x86_64-linux" }:

Insertion in release.nix at line 60 [9.1]

[9.738]

    let pkgs = import nixpkgs {inherit system;}; in

Replacement in release.nix at line 62 [9.1]
B:BD[9.739] → [9.739:752]
B:BD[9.752] → [12.26:60]
B:BD[12.60] → [8.368:429]
∅:D[8.429] → [9.865:874]
B:BD[9.865] → [9.865:874]
```
    build = 
      { tarball ? jobs.tarball {}
      , nixpkgs ? ../nixpkgs
      , system ? "x86_64-linux"
      }:
```
[9.739]
[9.874]
```
    with pkgs;
```

Replacement in release.nix at line 64 [9.1]

B:BD[9.875] → [18.533:611]

      let pkgs = import nixpkgs {inherit system;}; in
      
      with pkgs;

[9.875]

[10.184]

    let nix = nixSqlite; in

Replacement in release.nix at line 66 [9.1]

B:BD[10.185] → [8.430:460]

      let nix = nixSqlite; in

[10.185]

[9.925]

    stdenv.mkDerivation {
      name = "hydra-${tarball.version}";

Replacement in release.nix at line 69 [9.1]

B:BD[9.926] → [3.0:28]

∅:D[3.28] → [12.61:145]

B:BD[9.957] → [12.61:145]

      stdenv.mkDerivation {
        name = "hydra" + (if tarball ? version then "-" + tarball.version else "");

[9.926]

[9.987]

      buildInputs =
        [ perl makeWrapper libtool ]
        ++ (import ./deps.nix) { inherit pkgs; };

Replacement in release.nix at line 73 [9.1]

B:BD[9.988] → [18.612:725]

        buildInputs =
          [ perl makeWrapper libtool ]
          ++ (import ./deps.nix) { inherit pkgs; };

[9.988]

[9.1304]

      preUnpack = ''
        src=$(ls ${tarball}/tarballs/*.tar.bz2)
      ''; # */

Replacement in release.nix at line 77 [9.1]

B:BD[9.1305] → [9.1305:1328]

B:BD[9.1328] → [12.146:196]

∅:D[12.196] → [9.1383:1400]

B:BD[9.1383] → [9.1383:1400]

        preUnpack = ''
          src=$(ls ${tarball}/tarballs/*.tar.bz2)
        ''; # */

[9.1305]

[9.1400]

      hydraPath = stdenv.lib.concatStringsSep ":" (map (p: "${p}/bin") ( [
        libxslt sqlite subversion openssh nix coreutils findutils
        gzip bzip2 lzma gnutar unzip git
        gnused graphviz
      ] ++ ( if stdenv.isLinux then [rpm dpkg cdrkit] else [] )));

Replacement in release.nix at line 83 [9.1]

B:BD[9.1401] → [11.66:143]

∅:D[11.143] → [19.0:68]

B:BD[20.75] → [19.0:68]

B:BD[19.68] → [5.0:43]

∅:D[5.43] → [21.99:125]

B:BD[21.99] → [21.99:125]

B:BD[21.125] → [11.144:213]

        hydraPath = stdenv.lib.concatStringsSep ":" (map (p: "${p}/bin") ( [
          libxslt sqlite subversion openssh nix coreutils findutils
          gzip bzip2 lzma gnutar unzip git
          gnused graphviz
        ] ++ ( if stdenv.isLinux then [rpm dpkg cdrkit] else [] )));

[9.1401]

[20.173]

      installPhase = ''
        ensureDir $out/nix-support

Replacement in release.nix at line 86 [9.1]

∅:D[20.174] → [9.1401:1427]

∅:D[22.394] → [9.1401:1427]

B:BD[9.1401] → [9.1401:1427]

B:BD[9.1427] → [23.0:48]

∅:D[23.48] → [9.1427:1460]

B:BD[9.1427] → [9.1427:1460]

B:BD[9.1460] → [16.107:148]

        installPhase = ''
          ensureDir $out/nix-support
          
          ensureDir $out/libexec
          cp -prd src $out/libexec/hydra

[20.174]

[9.1507]

        ensureDir $out/libexec
        cp -prd src $out/libexec/hydra

Replacement in release.nix at line 89 [9.1]

B:BD[9.1508] → [20.175:223]

          mv $out/libexec/hydra/script $out/bin

[9.1508]

[10.324]

        mv $out/libexec/hydra/script $out/bin

Replacement in release.nix at line 91 [9.1]

B:BD[10.325] → [10.325:425]

B:BD[10.425] → [24.0:100]

          cp ${"${nixpkgs}/pkgs/build-support/fetchsvn/nix-prefetch-svn"} $out/bin/nix-prefetch-svn
          cp ${"${nixpkgs}/pkgs/build-support/fetchgit/nix-prefetch-git"} $out/bin/nix-prefetch-git

[10.325]

[22.531]

        cp ${"${nixpkgs}/pkgs/build-support/fetchsvn/nix-prefetch-svn"} $out/bin/nix-prefetch-svn
        cp ${"${nixpkgs}/pkgs/build-support/fetchgit/nix-prefetch-git"} $out/bin/nix-prefetch-git

Replacement in release.nix at line 94 [9.1]

B:BD[22.532] → [7.0:50]

∅:D[7.50] → [10.484:528]

B:BD[10.484] → [10.484:528]

          make -C src/c NIX=${nix} ATERM=${aterm}
          cp src/c/hydra_eval_jobs $out/bin

[22.532]

[9.1556]

        make -C src/c NIX=${nix} ATERM=${aterm}
        cp src/c/hydra_eval_jobs $out/bin

Replacement in release.nix at line 97 [9.1]

B:BD[9.1557] → [9.1557:1697]

B:BD[9.1697] → [4.0:58]

∅:D[25.54] → [26.0:56]

∅:D[4.58] → [26.0:56]

B:BD[20.381] → [26.0:56]

B:BD[26.56] → [27.0:107]

∅:D[27.107] → [9.1798:1813]

∅:D[26.113] → [9.1798:1813]

B:BD[9.1798] → [9.1798:1813]

          for i in $out/bin/*; do
              wrapProgram $i \
                  --prefix PERL5LIB ':' $out/libexec/hydra/lib:$PERL5LIB \
                  --prefix PATH ':' $out/bin:$hydraPath \
                  --set HYDRA_HOME $out/libexec/hydra \
                  --set HYDRA_RELEASE ${tarball.version} \
                  --set NIX_RELEASE ${nix.name}
          done

[9.1557]

[23.49]

        for i in $out/bin/*; do
            wrapProgram $i \
                --prefix PERL5LIB ':' $out/libexec/hydra/lib:$PERL5LIB \
                --prefix PATH ':' $out/bin:$hydraPath \
                --set HYDRA_HOME $out/libexec/hydra \
                --set HYDRA_RELEASE ${tarball.version} \
                --set NIX_RELEASE ${nix.name}
        done

Replacement in release.nix at line 106 [9.1]

B:BD[23.50] → [23.50:98]

B:BD[23.115] → [23.115:334]

B:BD[23.334] → [2.0:78]

∅:D[2.78] → [9.1813:1830]

∅:D[23.334] → [9.1813:1830]

B:BD[9.1813] → [9.1813:1830]

          ensureDir $out/share/doc/hydra/manual
          cp doc/manual/* $out/share/doc/hydra/manual/
          ln -s manual.html $out/share/doc/hydra/manual/index.html
          echo "doc manual $out/share/doc/hydra/manual" >> $out/nix-support/hydra-build-products
          echo "nix-build none $out" >> $out/nix-support/hydra-build-products
        ''; # */

[23.50]

[20.382]

        ensureDir $out/share/doc/hydra/manual
        cp doc/manual/* $out/share/doc/hydra/manual/
        ln -s manual.html $out/share/doc/hydra/manual/index.html
        echo "doc manual $out/share/doc/hydra/manual" >> $out/nix-support/hydra-build-products
        echo "nix-build none $out" >> $out/nix-support/hydra-build-products
      ''; # */

Replacement in release.nix at line 113 [9.1]

B:BD[20.383] → [20.383:466]

        meta = {
          description = "Build of Hydra on ${system}";
        };

[20.383]

[9.1830]

      meta = {
        description = "Build of Hydra on ${system}";

Insertion in release.nix at line 116 [9.1]
[9.1839]
[9.1839]
```
    };
```
Replacement in release.nix at line 118 [9.1]
B:BD[9.1840] → [9.1840:1855]
```
  };
in jobs
```
[9.1840]
```
}
```