anchor.diff:        };
         
       builds =
  -      { tarball ? jobs.tarball {}
  -      , system ? "x86_64-linux"
  -      }:
  -      
  +      {
  +        without_proxy = pkgs.lib.genAttrs systems (system:
  +          let
  +            disnixos = import "${pkgs.disnixos}/share/disnixos/testing.nix" {
  +              inherit nixpkgs system;
  +            };
  +          in
  +          disnixos.buildManifest {
  +            name = "disnix-proxy-example-without-proxy";
  +            version = builtins.readFile ./version;
  +            inherit tarball;
  +            servicesFile = "deployment/DistributedDeployment/services-without-proxy.nix";
  +            networkFile = "deployment/DistributedDeployment/network.nix";
  +            distributionFile = "deployment/DistributedDeployment/distribution-without-proxy.nix";
  +          });
  +        
  +        with_proxy = pkgs.lib.genAttrs systems (system:
  +          let
  +            disnixos = import "${pkgs.disnixos}/share/disnixos/testing.nix" {
  +              inherit nixpkgs system;
  +            };
  +          in
  +          disnixos.buildManifest {
  +            name = "disnix-proxy-example-with-proxy";
  +            version = builtins.readFile ./version;
  +            inherit tarball;
  +            servicesFile = "deployment/DistributedDeployment/services-with-proxy.nix";
  +            networkFile = "deployment/DistributedDeployment/network.nix";
  +            distributionFile = "deployment/DistributedDeployment/distribution-with-proxy.nix";
  +          });
  +      };
  +    
  +    tests = 
         let
  -        pkgs = import nixpkgs { inherit system; };
  -  
           disnixos = import "${pkgs.disnixos}/share/disnixos/testing.nix" {
  -          inherit nixpkgs nixos system;
  -        };
  -      in
  -      {
  -        without_proxy = disnixos.buildManifest {
  -          name = "disnix-proxy-example-without-proxy";
  -          version = builtins.readFile ./version;
  -          inherit tarball;
  -          servicesFile = "deployment/DistributedDeployment/services-without-proxy.nix";
  -          networkFile = "deployment/DistributedDeployment/network.nix";
  -          distributionFile = "deployment/DistributedDeployment/distribution-without-proxy.nix";
  -        };
  -        
  -        with_proxy = disnixos.buildManifest {
  -          name = "disnix-proxy-example-with-proxy";
  -          version = builtins.readFile ./version;
  -          inherit tarball;
  -          servicesFile = "deployment/DistributedDeployment/services-with-proxy.nix";
  -          networkFile = "deployment/DistributedDeployment/network.nix";
  -          distributionFile = "deployment/DistributedDeployment/distribution-with-proxy.nix";
  -        };
  -      };
  -            
  -    tests = 
  -
  -      let
  -        pkgs = import nixpkgs {};
  -  
  -        disnixos = import "${pkgs.disnixos}/share/disnixos/testing.nix" {
  -          inherit nixpkgs nixos;
  +          inherit nixpkgs;
           };
         in
         {
  
positive.code:       };
      
      doc =
        { tarball ? jobs.tarball {} }:
        
        with import nixpkgs {};
        
        releaseTools.nixBuild {
          name = "disnix-proxy-example-doc";
          version = builtins.readFile ./version;
          src = tarball;
          buildInputs = [ libxml2 libxslt dblatex tetex ];
          
          buildPhase = ''
            cd doc
            make docbookrng=${docbook5}/xml/rng/docbook docbookxsl=${docbook5_xsl}/xml/xsl/docbook
          '';
          
          checkPhase = "true";
  
negative.code: { nixpkgs ? <nixpkgs>
  , disnix_proxy_example ? {outPath = ./.; rev = 1234;}
  , officialRelease ? false
  , systems ? [ "i686-linux" "x86_64-linux" ]
  }:
  
  let
    pkgs = import nixpkgs {};
    
    jobs = rec {
      tarball =
        let
          disnixos = import "${pkgs.disnixos}/share/disnixos/testing.nix" {
            inherit nixpkgs;
          };
        in
        disnixos.sourceTarball {
  