grahamc/hydra - Change X7IAG7JTV4W6JH34JBC6KOVUGBAG643V4Y5MX4GTJL2BV5PP5VIQC

Simplify running nix-shell

This also removes building a separate source tarball or building a PDF manual since it's unlikely anybody cares.

Created by Eelco Dolstra on March 22, 2016

X7IAG7JTV4W6JH34JBC6KOVUGBAG643V4Y5MX4GTJL2BV5PP5VIQC

Dependencies

In channels

upstream

main

Change contents

File deletion: dev-shell

BF:BFD[16.2] → [17.254:287]

BF:BFD[17.287] → [17.1:1]

B:BD[17.1] → [14.0:21]

∅:D[14.21] → [17.13:253]

B:BD[17.13] → [17.13:253]

#! /usr/bin/env bash
s=$(type -p nix-shell)
exec $s release.nix -A build.x86_64-linux --exclude tarball --command "
    export NIX_REMOTE=daemon
    export NIX_PATH='$NIX_PATH'
    export NIX_BUILD_SHELL=$(type -p bash)
    exec $s release.nix -A tarball" "$@"

Replacement in README.md at line 3 [8.1]
B:BD[8.35] → [8.35:53]
```
    $ ./dev-shell
```
[8.35]
[8.53]
```
    $ nix-shell
```

Deletion in configure.ac at line 15 [18.15951]

B:BD[18.16097] → [19.0:161]

dnl Optional dependencies to build the manual, normally not needed
dnl since the tarball comes with the PDF and HTML manuals.
AC_PATH_PROG([DBLATEX], [dblatex])

Deletion in doc/manual/Makefile.am at line 12 [18.16946]
∅:D[5.133] → [18.17051:17129]
B:BD[18.17051] → [18.17051:17129]
```
dblatex_opts = \
 -V \
 -P doc.collab.show=0 \
 -P latex.output.revhistory=0
```
Deletion in doc/manual/Makefile.am at line 14 [18.16946]
B:BD[20.150] → [21.0:28]
```
#dist_pdf_DATA = manual.pdf
```

Replacement in doc/manual/Makefile.am at line 19 [18.16946]

B:BD[19.530] → [19.530:570]

B:BD[19.570] → [20.151:243]

∅:D[20.243] → [19.626:693]

B:BD[19.626] → [19.626:693]

B:BD[19.693] → [3.0:57]

∅:D[3.57] → [19.751:773]

B:BD[19.751] → [19.751:773]

	if test "$(XSLTPROC)" != ""; then				\
		$(XSLTPROC) $(xsltproc_opts) --nonet --xinclude		\
	           --output manual.html					\
	 	   $(docbookxsl)/html/docbook.xsl manual.xml;		\
	else								\
		echo "Please install xsltproc and rerun configure.";	\
		exit 1;							\
	fi

[19.530]

[19.773]

	$(XSLTPROC) $(xsltproc_opts) --nonet --xinclude		\
	  --output manual.html					\
	  $(docbookxsl)/xhtml/docbook.xsl manual.xml

Deletion in doc/manual/Makefile.am at line 23 [18.16946]
B:BD[19.774] → [22.0:29]
∅:D[22.29] → [19.775:811]
B:BD[18.17159] → [19.775:811]
B:BD[19.811] → [4.0:50]
∅:D[4.50] → [18.17245:17340]
∅:D[22.79] → [18.17245:17340]
∅:D[19.861] → [18.17245:17340]
B:BD[18.17245] → [18.17245:17340]
```
manual.pdf: $(DOCBOOK_FILES)
	if test "$(DBLATEX)" != ""; then \
	        $(DBLATEX) $(dblatex_opts) manual.xml; \
	else \
	        echo "Please install dblatex and rerun configure."; \
	        exit 1; \
	fi
```

Replacement in doc/manual/Makefile.am at line 25 [18.16946]

B:BD[20.280] → [20.280:478]

	if cp $(docbookxsl)/images/callouts/*.gif images/callouts; then	\
		chmod +wx images images/callouts;			\
	else								\
		echo "Please install Docbook XSL and try again.";	\
		exit 1;							\
	fi

[20.280]

[20.478]

	cp $(docbookxsl)/images/callouts/*.gif images/callouts
	chmod +wx images images/callouts

Replacement in doc/manual/hacking.xml at line 25 [6.1]
B:BD[6.652] → [6.652:666]
```
$ ./dev-shell
```
[6.652]
[6.666]
```
$ nix-shell
```

Replacement in release.nix at line 1 [23.1]

B:BD[23.1] → [24.0:68]

{ hydraSrc ? { outPath = ./.; revCount = 1234; gitTag = "abcdef"; }

[23.1]

[25.65]

{ hydraSrc ? { outPath = ./.; revCount = 1234; rev = "abcdef"; }

Insertion in release.nix at line 31 [23.1]

[26.533]

[15.92]

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

Deletion in release.nix at line 38 [23.1]
∅:D[15.178] → [27.112:113]
B:BD[27.112] → [27.112:113]
∅:D[28.1] → [29.729:741]
∅:D[27.113] → [29.729:741]
B:BD[25.101] → [29.729:741]
B:BD[29.741] → [15.179:194]
∅:D[30.60] → [23.23:24]
∅:D[25.101] → [23.23:24]
∅:D[15.194] → [23.23:24]
∅:D[18.17585] → [23.23:24]
B:BD[23.23] → [23.23:24]
B:BD[23.24] → [18.17586:17653]
B:BD[18.17653] → [11.0:55]
∅:D[11.55] → [18.17698:17729]
B:BD[18.17698] → [18.17698:17729]
B:BD[18.17729] → [31.0:45]
∅:D[31.45] → [32.74:75]
B:BD[18.17729] → [32.74:75]
B:BD[32.75] → [33.40:60]
B:BD[33.60] → [13.0:75]
∅:D[34.73] → [32.76:77]
∅:D[35.74] → [32.76:77]
∅:D[13.75] → [32.76:77]
∅:D[36.77] → [32.76:77]
∅:D[37.81] → [32.76:77]
∅:D[38.84] → [32.76:77]
∅:D[28.87] → [32.76:77]
∅:D[21.96] → [32.76:77]
∅:D[31.114] → [32.76:77]
∅:D[33.134] → [32.76:77]
∅:D[39.146] → [32.76:77]
∅:D[40.146] → [32.76:77]
B:BD[18.17782] → [32.76:77]
B:BD[32.77] → [40.147:257]
B:BD[40.257] → [17.355:374]
∅:D[17.374] → [32.101:188]
B:BD[32.101] → [32.101:188]
B:BD[32.188] → [41.0:48]
B:BD[41.48] → [42.70:126]
B:BD[42.126] → [12.0:59]
∅:D[12.59] → [41.90:138]
∅:D[42.126] → [41.90:138]
B:BD[41.90] → [41.90:138]
∅:D[43.83] → [31.115:125]
∅:D[41.138] → [31.115:125]
∅:D[44.248] → [31.115:125]
B:BD[32.188] → [31.115:125]
```
  tarball =
    with pkgs;
    releaseTools.makeSourceTarball {
      name = "hydra-tarball";
      src = if lib.inNixShell then null else hydraSrc;
      inherit officialRelease;
      version = builtins.readFile ./version;
      buildInputs =
        [ perl libxslt nukeReferences pkgconfig nixUnstable git openssl ];
      versionSuffix = if officialRelease then "" else "pre${toString hydraSrc.revCount}-${hydraSrc.gitTag}";
      preHook = ''
        # TeX needs a writable font cache.
        export VARTEXFONTS=$TMPDIR/texfonts
        addToSearchPath PATH $(pwd)/src/script
        addToSearchPath PATH $(pwd)/src/hydra-eval-jobs
        addToSearchPath PATH $(pwd)/src/hydra-queue-runner
        addToSearchPath PERL5LIB $(pwd)/src/lib
      '';
```

Deletion in release.nix at line 39 [23.1]

B:BD[45.1] → [9.0:225]

∅:D[9.225] → [46.0:23]

B:BD[45.1] → [46.0:23]

B:BD[46.23] → [39.147:212]

∅:D[45.45] → [31.125:126]

∅:D[46.126] → [31.125:126]

∅:D[39.212] → [31.125:126]

B:BD[31.125] → [31.125:126]

B:BD[31.126] → [47.0:20]

B:BD[47.20] → [48.0:49]

B:BD[49.87] → [49.87:88]

B:BD[49.88] → [50.0:64]

B:BD[49.269] → [49.269:319]

∅:D[51.95] → [32.188:198]

∅:D[49.319] → [32.188:198]

∅:D[31.336] → [32.188:198]

B:BD[32.188] → [32.188:198]

∅:D[32.198] → [25.1540:1548]

B:BD[25.1540] → [25.1540:1548]

B:BD[25.1548] → [28.88:89]

      postUnpack = ''
        # Clean up when building from a working tree.
        if [ -z "$IN_NIX_SHELL" ]; then
          (cd $sourceRoot && (git ls-files -o --directory | xargs -r rm -rfv)) || true
        fi
      '';
      configureFlags =
        [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ];
      postDist = ''
        make -C doc/manual install prefix="$out"
        echo "doc manual $out/share/doc/hydra manual.html" >> \
          "$out/nix-support/hydra-build-products"
      '';
    };

Replacement in release.nix at line 105 [23.1]
∅:D[52.24] → [53.1145:1165]
B:BD[53.1145] → [53.1145:1165]
```
            nix git
```
[53.1145]
[53.1165]
```
            nix git boehmgc
```
Replacement in release.nix at line 113 [23.1]
B:BD[54.22] → [29.753:774]
```
      src = tarball;
```
[54.22]
[23.925]
```
      src = if lib.inNixShell then null else hydraSrc;
```

Replacement in release.nix at line 117 [23.1]

B:BD[25.1780] → [10.35:111]

∅:D[10.111] → [55.0:77]

∅:D[39.281] → [55.0:77]

B:BD[53.1272] → [55.0:77]

        [ makeWrapper libtool unzip nukeReferences pkgconfig sqlite libpqxx
          gitAndTools.topGit mercurial darcs subversion bazaar openssl bzip2

[25.1780]

[53.1343]

        [ makeWrapper autoconf automake libtool unzip nukeReferences pkgconfig sqlite libpqxx
          gitAndTools.topGit mercurial darcs subversion bazaar openssl bzip2 libxslt

Insertion in release.nix at line 133 [23.1]

[34.75]

[7.0]

      postUnpack = ''
        # Clean up when building from a working tree.
        if [ -z "$IN_NIX_SHELL" ]; then
          (cd $sourceRoot && (git ls-files -o --directory | xargs -r rm -rfv)) || true
        fi
      '';
      configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ];
      preConfigure = "autoreconf -vfi";
      enableParallelBuilding = true;

Replacement in release.nix at line 158 [23.1]

B:BD[25.2937] → [25.2937:2994]

                --set HYDRA_RELEASE ${tarball.version} \

[25.2883]

[2.0]

                --set HYDRA_RELEASE ${version} \

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

[16.2]

(import ./release.nix {}).build.x86_64-linux

Simplify running nix-shell

Dependencies

In channels

Change contents

File deletion: dev-shell

Replacement in README.md at line 3 [8.1]

Deletion in configure.ac at line 15 [18.15951]

Deletion in doc/manual/Makefile.am at line 12 [18.16946]

Deletion in doc/manual/Makefile.am at line 14 [18.16946]

Replacement in doc/manual/Makefile.am at line 19 [18.16946]

Deletion in doc/manual/Makefile.am at line 23 [18.16946]

Replacement in doc/manual/Makefile.am at line 25 [18.16946]

Replacement in doc/manual/hacking.xml at line 25 [6.1]