commit 7682c2fd61caa805fff1752e6671a7d8e653b7f3 · pyrox.dev/nixpkgs

+6 -7

nixos/tests/hydra/default.nix

···

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
          trivialJob = pkgs.writeTextDir "trivial.nix" ''

     

       5
       5
       -
            with import <nix/config.nix>;

     

       6
       6
       -
       

     

       7
       5
        
            { trivial = builtins.derivation {

     

       8
       6
        
                name = "trivial";

     

       9
       7
        
                system = "x86_64-linux";

     

       10
       10
       -
                PATH = coreutils;

     

       11
       11
       -
                builder = shell;

     

       12
       12
       -
                args = ["-c" "touch $out; exit 0"];

     

       8
       8
       +
                builder = "/bin/sh";

     

       9
       9
       +
                args = ["-c" "echo success > $out; exit 0"];

     

       13
       10
        
              };

     

       14
       11
        
            }

     

       15
       12
        
          '';

     
···

       27
       24
        
       in {

     

       28
       25
        
         name = "hydra-init-localdb";

     

       29
       26
        
         meta = with pkgs.stdenv.lib.maintainers; {

     

       30
       30
       -
           maintainers = [ pstn lewo ];

     

       27
       27
       +
           maintainers = [ pstn lewo ma27 ];

     

       31
       28
        
         };

     

       32
       29
        
       

     

       33
       30
        
         machine =

     
···

       50
       47
        
                 hostName = "localhost";

     

       51
       48
        
                 systems = [ "x86_64-linux" ];

     

       52
       49
        
               }];

     

       50
       50
       +
       

     

       51
       51
       +
               binaryCaches = [];

     

       53
       52
        
             };

     

       54
       53
        
           };

     

       55
       54
        
       

     
···

       74
       73
        
             $machine->succeed("create-trivial-project.sh");

     

       75
       74
        
       

     

       76
       75
        
             $machine->waitUntilSucceeds('curl -L -s http://localhost:3000/build/1 -H "Accept: application/json" |  jq .buildstatus | xargs test 0 -eq');

     

       77
       77
       -
            '';

     

       76
       76
       +
           '';

     

       78
       77
        
       })

+25 -13

pkgs/development/tools/misc/hydra/default.nix

···

       3
       3
        
       , gitAndTools, mercurial, darcs, subversion, bazaar, openssl, bzip2, libxslt

     

       4
       4
        
       , guile, perl, postgresql, nukeReferences, git, boehmgc

     

       5
       5
        
       , docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar

     

       6
       6
       -
       , rpm, dpkg, cdrkit, pixz }:

     

       6
       6
       +
       , rpm, dpkg, cdrkit, pixz, lib, fetchpatch, boost, autoreconfHook

     

       7
       7
       +
       }:

     

       7
       8
        
       

     

       8
       9
        
       with stdenv;

     

       9
       10
        
       

     

       10
       11
        
       let

     

       12
       12
       +
         isGreaterNix20 = with lib.versions;

     

       13
       13
       +
           let

     

       14
       14
       +
             inherit (nix) version;

     

       15
       15
       +
             inherit (lib) toInt;

     

       16
       16
       +
           in major version == "2" && toInt (minor version) >= 1 || toInt (major version) > 2;

     

       17
       17
       +
       

     

       11
       18
        
         perlDeps = buildEnv {

     

       12
       19
        
           name = "hydra-perl-deps";

     

       13
       20
        
           paths = with perlPackages;

     
···

       63
       70
        
         };

     

       64
       71
        
       in releaseTools.nixBuild rec {

     

       65
       72
        
         name = "hydra-${version}";

     

       66
       66
       -
         version = "2017-11-21";

     

       73
       73
       +
         version = "2018-08-07";

     

       67
       74
        
       

     

       68
       75
        
         inherit stdenv;

     

       69
       76
        
       

     

       70
       77
        
         src = fetchFromGitHub {

     

       71
       78
        
           owner = "NixOS";

     

       72
       79
        
           repo = "hydra";

     

       73
       73
       -
           rev = "b7bc4384b7b471d1ddf892cb03f16189a66d5a0d";

     

       74
       74
       -
           sha256 = "05g37z3ilazzqa5rqj5zljndwxjbvpc18xibh6jlwjwpvg3kpbbh";

     

       80
       80
       +
           rev = "4dca8fe14d3f782bdf927f37efce722acefffff3";

     

       81
       81
       +
           sha256 = "1yas4psmvfp7lhcp81ia2sy93b78j9hiw9a6n3q2m1a616hwpm25";

     

       75
       82
        
         };

     

       76
       83
        
       

     

       77
       84
        
         buildInputs =

     
···

       80
       87
        
             guile # optional, for Guile + Guix support

     

       81
       88
        
             perlDeps perl nix

     

       82
       89
        
             postgresql # for running the tests

     

       83
       83
       -
           ];

     

       90
       90
       +
           ] ++ lib.optionals isGreaterNix20 [ boost ];

     

       84
       91
        
       

     

       85
       92
        
         hydraPath = lib.makeBinPath (

     

       86
       93
        
           [ sqlite subversion openssh nix coreutils findutils pixz

     

       87
       94
        
             gzip bzip2 lzma gnutar unzip git gitAndTools.topGit mercurial darcs gnused bazaar

     

       88
       95
        
           ] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] );

     

       89
       96
        
       

     

       90
       90
       -
         postUnpack = ''

     

       91
       91
       -
           # Clean up when building from a working tree.

     

       92
       92
       -
           (cd $sourceRoot && (git ls-files -o --directory | xargs -r rm -rfv)) || true

     

       93
       93
       -
         '';

     

       97
       97
       +
         nativeBuildInputs = [ autoreconfHook ];

     

       98
       98
       +
       

     

       99
       99
       +
         # adds a patch which ensures compatibility with the API of Nix 2.0.

     

       100
       100
       +
         # it has been reverted in https://github.com/NixOS/hydra/commit/162d671c48a418bd10a8a171ca36787ef3695a44,

     

       101
       101
       +
         # for Nix 2.1/unstable compatibility. Reapplying helps if Nix 2.0 is used to keep the build functional.

     

       102
       102
       +
         patches = lib.optionals (!isGreaterNix20) [

     

       103
       103
       +
           (fetchpatch {

     

       104
       104
       +
             url = "https://github.com/NixOS/hydra/commit/08de434bdd0b0a22abc2081be6064a6c846d3920.patch";

     

       105
       105
       +
             sha256 = "0kz77njp5ynn9l81g3q8zrryvnsr06nk3iw0a60187wxqzf5fmf8";

     

       106
       106
       +
           })

     

       107
       107
       +
         ];

     

       94
       108
        
       

     

       95
       109
        
         configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ];

     

       96
       110
        
       

     
···

       98
       112
        
           PATH=$(pwd)/src/script:$(pwd)/src/hydra-eval-jobs:$(pwd)/src/hydra-queue-runner:$(pwd)/src/hydra-evaluator:$PATH

     

       99
       113
        
           PERL5LIB=$(pwd)/src/lib:$PERL5LIB;

     

       100
       114
        
         '';

     

       101
       101
       -
       

     

       102
       102
       -
         preConfigure = "autoreconf -vfi";

     

       103
       115
        
       

     

       104
       116
        
         enableParallelBuilding = true;

     

       105
       117
        
       

     
···

       130
       142
        
           description = "Nix-based continuous build system";

     

       131
       143
        
           license = licenses.gpl3;

     

       132
       144
        
           platforms = platforms.linux;

     

       133
       133
       -
           maintainers = with maintainers; [ domenkozar ];

     

       145
       145
       +
           maintainers = with maintainers; [ domenkozar ma27 ];

     

       134
       146
        
         };

     

       135
       135
       -
        }

     

       147
       147
       +
       }