commit 8d4068d9d16178d1454b9219d6319bf755c98dd3 · pyrox.dev/nixpkgs

+3 -5

maintainers/scripts/all-tarballs.nix

···

       6
       6
        
          $ copy-tarballs.pl --expr 'import <nixpkgs/maintainers/scripts/all-tarballs.nix>'

     

       7
       7
        
       */

     

       8
       8
        
       

     

       9
       9
       -
       removeAttrs (import ../../pkgs/top-level/release.nix

     

       9
       9
       +
       import ../../pkgs/top-level/release.nix

     

       10
       10
        
         { # Don't apply ‘hydraJob’ to jobs, because then we can't get to the

     

       11
       11
        
           # dependency graph.

     

       12
       12
        
           scrubJobs = false;

     

       13
       13
        
           # No need to evaluate on i686.

     

       14
       14
        
           supportedSystems = [ "x86_64-linux" ];

     

       15
       15
       -
         })

     

       16
       16
       -
         [ # Remove jobs whose evaluation depends on a writable Nix store.

     

       17
       17
       -
           "tarball" "unstable" "darwin-tested"

     

       18
       18
       -
         ]

     

       15
       15
       +
           limitedSupportedSystems = [];

     

       16
       16
       +
         }

+2 -2

pkgs/top-level/make-tarball.nix

···

       42
       42
        
       

     

       43
       43
        
           echo 'abort "Illegal use of <nixpkgs> in Nixpkgs."' > $TMPDIR/barf.nix

     

       44
       44
        
       

     

       45
       45
       -
           # Make sure that Nixpkgs does not use <nixpkgs>

     

       45
       45
       +
           # Make sure that Nixpkgs does not use <nixpkgs>.

     

       46
       46
        
           badFiles=$(find pkgs -type f -name '*.nix' -print | xargs grep -l '^[^#]*<nixpkgs\/' || true)

     

       47
       47
        
           if [[ -n $badFiles ]]; then

     

       48
       48
        
               echo "Nixpkgs is not allowed to use <nixpkgs> to refer to itself."

     
···

       101
       101
        
           stopNest

     

       102
       102
        
       

     

       103
       103
        
           header "checking find-tarballs.nix"

     

       104
       104
       -
           nix-instantiate --eval --strict --show-trace --json \

     

       104
       104
       +
           nix-instantiate --readonly-mode --eval --strict --show-trace --json \

     

       105
       105
        
              ./maintainers/scripts/find-tarballs.nix \

     

       106
       106
        
             --arg expr 'import ./maintainers/scripts/all-tarballs.nix' > $TMPDIR/tarballs.json

     

       107
       107
        
           nrUrls=$(jq -r '.[].url' < $TMPDIR/tarballs.json | wc -l)

+33 -30

pkgs/top-level/release.nix

···

       29
       29
        
       

     

       30
       30
        
         systemsWithAnySupport = supportedSystems ++ limitedSupportedSystems;

     

       31
       31
        
       

     

       32
       32
       +
         supportDarwin = builtins.elem "x86_64-darwin" systemsWithAnySupport;

     

       33
       33
       +
       

     

       32
       34
        
         jobs =

     

       33
       35
        
           { tarball = import ./make-tarball.nix { inherit pkgs nixpkgs officialRelease; };

     

       34
       36
        
       

     
···

       37
       39
        
             manual = import ../../doc;

     

       38
       40
        
             lib-tests = import ../../lib/tests/release.nix { inherit pkgs; };

     

       39
       41
        
       

     

       40
       40
       -
             darwin-tested = pkgs.releaseTools.aggregate

     

       42
       42
       +
             darwin-tested = if supportDarwin then pkgs.releaseTools.aggregate

     

       41
       43
        
               { name = "nixpkgs-darwin-${jobs.tarball.version}";

     

       42
       44
        
                 meta.description = "Release-critical builds for the Nixpkgs darwin channel";

     

       43
       45
        
                 constituents =

     
···

       70
       72
        
                     jobs.tests.stdenv-inputs.x86_64-darwin

     

       71
       73
        
                     jobs.tests.macOSSierraShared.x86_64-darwin

     

       72
       74
        
                   ];

     

       73
       73
       -
               };

     

       75
       75
       +
               } else null;

     

       74
       76
        
       

     

       75
       77
        
             unstable = pkgs.releaseTools.aggregate

     

       76
       78
        
               { name = "nixpkgs-${jobs.tarball.version}";

     
···

       81
       83
        
                     jobs.manual

     

       82
       84
        
                     jobs.lib-tests

     

       83
       85
        
                     jobs.stdenv.x86_64-linux

     

       84
       84
       -
                     jobs.stdenv.x86_64-darwin

     

       85
       86
        
                     jobs.linux.x86_64-linux

     

       86
       87
        
                     jobs.python.x86_64-linux

     

       87
       87
       -
                     jobs.python.x86_64-darwin

     

       88
       88
        
                     jobs.python3.x86_64-linux

     

       89
       89
       -
                     jobs.python3.x86_64-darwin

     

       90
       89
        
                     # Needed by travis-ci to test PRs

     

       91
       90
        
                     jobs.nox.x86_64-linux

     

       92
       92
       -
                     jobs.nox.x86_64-darwin

     

       93
       91
        
                     # Needed for support

     

       94
       92
        
                     jobs.nix-info.x86_64-linux

     

       95
       95
       -
                     jobs.nix-info.x86_64-darwin

     

       96
       93
        
                     jobs.nix-info-tested.x86_64-linux

     

       97
       97
       -
                     jobs.nix-info-tested.x86_64-darwin

     

       98
       94
        
                     # Ensure that X11/GTK+ are in order.

     

       99
       95
        
                     jobs.thunderbird.x86_64-linux

     

       100
       100
       -
                     # Ensure that basic stuff works on darwin

     

       101
       101
       -
                     jobs.git.x86_64-darwin

     

       102
       102
       -
                     jobs.mariadb.x86_64-darwin

     

       103
       103
       -
                     jobs.vim.x86_64-darwin

     

       104
       104
       -
                     # Ensure that UI stuff works on darwin

     

       105
       105
       -
                     jobs.inkscape.x86_64-darwin

     

       106
       106
       -
                     jobs.qt5.qtmultimedia.x86_64-darwin

     

       107
       96
        
       

     

       108
       97
        
                     jobs.tests.cc-wrapper.x86_64-linux

     

       109
       109
       -
                     jobs.tests.cc-wrapper.x86_64-darwin

     

       110
       98
        
                     jobs.tests.cc-wrapper-gcc7.x86_64-linux

     

       111
       111
       -
                     jobs.tests.cc-wrapper-gcc7.x86_64-darwin

     

       112
       99
        
                     jobs.tests.cc-wrapper-gcc8.x86_64-linux

     

       113
       100
        
       

     

       114
       101
        
                     # broken see issue #40038

     

       115
       115
       -
                     # jobs.tests.cc-wrapper-gcc8.x86_64-darwin

     

       116
       102
        
       

     

       117
       103
        
                     jobs.tests.cc-wrapper-clang.x86_64-linux

     

       118
       118
       -
                     jobs.tests.cc-wrapper-clang.x86_64-darwin

     

       119
       104
        
                     jobs.tests.cc-wrapper-libcxx.x86_64-linux

     

       120
       120
       -
                     jobs.tests.cc-wrapper-libcxx.x86_64-darwin

     

       121
       105
        
                     jobs.tests.cc-wrapper-clang-39.x86_64-linux

     

       122
       122
       -
                     jobs.tests.cc-wrapper-clang-39.x86_64-darwin

     

       123
       106
        
                     jobs.tests.cc-wrapper-libcxx-39.x86_64-linux

     

       124
       124
       -
                     jobs.tests.cc-wrapper-libcxx-39.x86_64-darwin

     

       125
       107
        
                     jobs.tests.cc-wrapper-clang-4.x86_64-linux

     

       126
       126
       -
                     jobs.tests.cc-wrapper-clang-4.x86_64-darwin

     

       127
       108
        
                     jobs.tests.cc-wrapper-libcxx-4.x86_64-linux

     

       128
       128
       -
                     jobs.tests.cc-wrapper-libcxx-4.x86_64-darwin

     

       129
       109
        
                     jobs.tests.cc-wrapper-clang-5.x86_64-linux

     

       130
       130
       -
                     jobs.tests.cc-wrapper-clang-5.x86_64-darwin

     

       131
       110
        
                     jobs.tests.cc-wrapper-libcxx-5.x86_64-linux

     

       132
       132
       -
                     jobs.tests.cc-wrapper-libcxx-6.x86_64-darwin

     

       133
       111
        
                     jobs.tests.cc-wrapper-clang-6.x86_64-linux

     

       134
       134
       -
                     jobs.tests.cc-wrapper-clang-6.x86_64-darwin

     

       135
       112
        
                     jobs.tests.cc-wrapper-libcxx-6.x86_64-linux

     

       136
       136
       -
                     jobs.tests.cc-wrapper-libcxx-6.x86_64-darwin

     

       137
       113
        
                     jobs.tests.cc-multilib-gcc.x86_64-linux

     

       138
       114
        
                     jobs.tests.cc-multilib-clang.x86_64-linux

     

       139
       115
        
                     jobs.tests.stdenv-inputs.x86_64-linux

     

       116
       116
       +
                   ]

     

       117
       117
       +
                   ++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools

     

       118
       118
       +
                   ++ lib.optionals supportDarwin [

     

       119
       119
       +
                     jobs.stdenv.x86_64-darwin

     

       120
       120
       +
                     jobs.python.x86_64-darwin

     

       121
       121
       +
                     jobs.python3.x86_64-darwin

     

       122
       122
       +
                     jobs.nox.x86_64-darwin

     

       123
       123
       +
                     jobs.nix-info.x86_64-darwin

     

       124
       124
       +
                     jobs.nix-info-tested.x86_64-darwin

     

       125
       125
       +
                     jobs.git.x86_64-darwin

     

       126
       126
       +
                     jobs.mariadb.x86_64-darwin

     

       127
       127
       +
                     jobs.vim.x86_64-darwin

     

       128
       128
       +
                     jobs.inkscape.x86_64-darwin

     

       129
       129
       +
                     jobs.qt5.qtmultimedia.x86_64-darwin

     

       130
       130
       +
                     jobs.tests.cc-wrapper.x86_64-darwin

     

       131
       131
       +
                     jobs.tests.cc-wrapper-gcc7.x86_64-darwin

     

       132
       132
       +
                     # jobs.tests.cc-wrapper-gcc8.x86_64-darwin

     

       133
       133
       +
                     jobs.tests.cc-wrapper-clang.x86_64-darwin

     

       134
       134
       +
                     jobs.tests.cc-wrapper-libcxx.x86_64-darwin

     

       135
       135
       +
                     jobs.tests.cc-wrapper-clang-39.x86_64-darwin

     

       136
       136
       +
                     jobs.tests.cc-wrapper-libcxx-39.x86_64-darwin

     

       137
       137
       +
                     jobs.tests.cc-wrapper-clang-4.x86_64-darwin

     

       138
       138
       +
                     jobs.tests.cc-wrapper-libcxx-4.x86_64-darwin

     

       139
       139
       +
                     jobs.tests.cc-wrapper-clang-5.x86_64-darwin

     

       140
       140
       +
                     jobs.tests.cc-wrapper-libcxx-6.x86_64-darwin

     

       141
       141
       +
                     jobs.tests.cc-wrapper-clang-6.x86_64-darwin

     

       142
       142
       +
                     jobs.tests.cc-wrapper-libcxx-6.x86_64-darwin

     

       140
       143
        
                     jobs.tests.stdenv-inputs.x86_64-darwin

     

       141
       144
        
                     jobs.tests.macOSSierraShared.x86_64-darwin

     

       142
       142
       -
                   ] ++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools;

     

       145
       145
       +
                   ];

     

       143
       146
        
               };

     

       144
       147
        
       

     

       145
       148
        
             stdenvBootstrapTools = with lib;

     
···

       152
       155
        
                     dist test;

     

       153
       156
        
                 })

     

       154
       157
        
               # darwin is special in this

     

       155
       155
       -
               // optionalAttrs (builtins.elem "x86_64-darwin" systemsWithAnySupport) {

     

       158
       158
       +
               // optionalAttrs supportDarwin {

     

       156
       159
        
                 x86_64-darwin =

     

       157
       160
        
                   let

     

       158
       161
        
                     bootstrap = import ../stdenv/darwin/make-bootstrap-tools.nix { system = "x86_64-darwin"; };