Skip to content

Commit

Permalink
stdenv: Update Linux bootstrap tarballs
Browse files Browse the repository at this point in the history
Update bootstrap tarballs to new ones built from:
    - nixpkgs/trunk evaluation (for i686, x86_64): https://hydra.nixos.org/eval/1471711
    - nixpkgs/cross-trunk evaluation (for the rest): https://hydra.nixos.org/eval/1471710

which are both based on commit
fd81a2e from 2018-07-31.
(This is the latest one that has a successful nixpkgs-unstable build and
a matching cross-trunk evaluation.)

The corresponding builds are:
---------------------------
i686      https://hydra.nixos.org/build/78815282
x86_64    https://hydra.nixos.org/build/78786592
armv5tel  https://hydra.nixos.org/build/78784152
armv6l    https://hydra.nixos.org/build/78784084
armv7l    https://hydra.nixos.org/build/78784109
aarch64   https://hydra.nixos.org/build/78784046
---------------------------
whose URLs and hashes were imported to the repo by pasting the above
list as the stdin of the following script:
---------------------------
URL_BASE="https://cs.helsinki.fi/u/tmtynkky/tmp-bootstrap"
COMMIT="fd81a2ecb6b85594dc79ad53566c822849d4e47a"

while read arch url; do
    nixFile="pkgs/stdenv/linux/bootstrap-files/$arch.nix"
    echo "{" > $nixFile

    curl -H 'Accept: application/json' $url | jq '.buildproducts | map(values) | map([.name, .path] | join(" ")) | join("\n")' -r | sort -r | while read name path rest; do
        nix-store -r $path
        dir="stdenv-linux/$arch/$COMMIT"
        mkdir -p to-upload/$dir
        cp $path to-upload/$dir/

        if [ "$name" = busybox ]; then
            echo "  busybox = import <nix/fetchurl.nix> {" >> $nixFile
            sha256=$(nix-hash --type sha256 --base32 $path)
        else
            echo "  bootstrapTools = import <nix/fetchurl.nix> {" >> $nixFile
            sha256=$(nix-hash --type sha256 --base32 --flat $path)
        fi
        echo "    url = $URL_BASE/$dir/$name;" >> $nixFile
        echo "    sha256 = \"$sha256\";" >> $nixFile
        if [ "$name" = busybox ]; then
            echo "    executable = true;" >> $nixFile
        fi
        echo "  };" >> $nixFile
    done

    echo "}" >> $nixFile
done
---------------------------
Note that we no longer use i686 bootstrap for x86_64 since that doesn't
work in WSL (so this fixes NixOS#24954).
  • Loading branch information
dezgeg committed Aug 27, 2018
1 parent afea12f commit d9dd94a
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 29 deletions.
8 changes: 4 additions & 4 deletions pkgs/stdenv/linux/bootstrap-files/aarch64.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
busybox = import <nix/fetchurl.nix> {
url = http://nixos-arm.dezgeg.me/bootstrap-aarch64-2017-03-11-bb3ef8/busybox;
sha256 = "12qcml1l67skpjhfjwy7gr10nc86gqcwjmz9ggp7knss8gq8pv7f";
url = https://cs.helsinki.fi/u/tmtynkky/tmp-bootstrap/stdenv-linux/aarch64/fd81a2ecb6b85594dc79ad53566c822849d4e47a/busybox;
sha256 = "15xc6hpxgy0j8rgpf5v7m40r2i4d623c9bi9007i37yrmlg924d7";
executable = true;
};
bootstrapTools = import <nix/fetchurl.nix> {
url = http://nixos-arm.dezgeg.me/bootstrap-aarch64-2017-03-11-bb3ef8/bootstrap-tools.tar.xz;
sha256 = "1075d5n4yclbhgisi6ba50601mw3fhivlkjs462qlnq8hh0xc7nq";
url = https://cs.helsinki.fi/u/tmtynkky/tmp-bootstrap/stdenv-linux/aarch64/fd81a2ecb6b85594dc79ad53566c822849d4e47a/bootstrap-tools.tar.xz;
sha256 = "19hdkq0a9q26855s0dbhwflfly9bx7kzh359w0p1j8bjxhffziqq";
};
}
9 changes: 4 additions & 5 deletions pkgs/stdenv/linux/bootstrap-files/armv5tel.nix
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
{
busybox = import <nix/fetchurl.nix> {
url = http://nixos-arm.dezgeg.me/bootstrap-2017-04-13-1f32d4b4/armv5tel/busybox;
sha256 = "00mxas5xg2j9n1g0q0nklr0dy87qqxk0jja5qz1yi7xl7zzsnpnw";
url = https://cs.helsinki.fi/u/tmtynkky/tmp-bootstrap/stdenv-linux/armv5tel/fd81a2ecb6b85594dc79ad53566c822849d4e47a/busybox;
sha256 = "02rhgs1zxvkqqhfrx01spxlz4xhh4cbfakfn3n96w8ihxgzk4v01";
executable = true;
};

bootstrapTools = import <nix/fetchurl.nix> {
url = http://nixos-arm.dezgeg.me/bootstrap-2017-04-13-1f32d4b4/armv5tel/bootstrap-tools.tar.xz;
sha256 = "0fhiy9l3mbmlhpkby31c2s63bhjiqx25qqr3wdp8cb7fxz8ayx2f";
url = https://cs.helsinki.fi/u/tmtynkky/tmp-bootstrap/stdenv-linux/armv5tel/fd81a2ecb6b85594dc79ad53566c822849d4e47a/bootstrap-tools.tar.xz;
sha256 = "1nya00fnsimk8hicjq0i3n7aa19y7qgps2bh64qhcyn444nk9spw";
};
}
9 changes: 4 additions & 5 deletions pkgs/stdenv/linux/bootstrap-files/armv6l.nix
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
{
busybox = import <nix/fetchurl.nix> {
url = http://nixos-arm.dezgeg.me/bootstrap-2017-04-13-1f32d4b4/armv6l/busybox;
sha256 = "06n8dy8y2v28yx9ws8x64wxrvn9pszgpd299hc90nv9x21m79jzd";
url = https://cs.helsinki.fi/u/tmtynkky/tmp-bootstrap/stdenv-linux/armv6l/fd81a2ecb6b85594dc79ad53566c822849d4e47a/busybox;
sha256 = "1n1r8c4f1mfscbxq13n72xj292hhpcr4d8gpfd7nfk8r87c9mlj4";
executable = true;
};

bootstrapTools = import <nix/fetchurl.nix> {
url = http://nixos-arm.dezgeg.me/bootstrap-2017-04-13-1f32d4b4/armv6l/bootstrap-tools.tar.xz;
sha256 = "1gg2q3sw81vi65g1gmpvx0nnd6hxb76vlz73wfp292m90z1mym7f";
url = https://cs.helsinki.fi/u/tmtynkky/tmp-bootstrap/stdenv-linux/armv6l/fd81a2ecb6b85594dc79ad53566c822849d4e47a/bootstrap-tools.tar.xz;
sha256 = "06az5zp9cbjpg0d12f62bv5d8c2gqsb56m5mik7vl7hm5i53yq1f";
};
}
9 changes: 4 additions & 5 deletions pkgs/stdenv/linux/bootstrap-files/armv7l.nix
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
{
busybox = import <nix/fetchurl.nix> {
url = http://nixos-arm.dezgeg.me/bootstrap-2017-04-13-1f32d4b4/armv7l/busybox;
sha256 = "187xwzsng5lpak1nanrk88y4mlydmrbhx6la00rrd6kjx376s565";
url = https://cs.helsinki.fi/u/tmtynkky/tmp-bootstrap/stdenv-linux/armv7l/fd81a2ecb6b85594dc79ad53566c822849d4e47a/busybox;
sha256 = "1y16xgm9vfn8w6jbh0qif5lyv6rjynm22khc3nxqa1w6m14jiz08";
executable = true;
};

bootstrapTools = import <nix/fetchurl.nix> {
url = http://nixos-arm.dezgeg.me/bootstrap-2017-04-13-1f32d4b4/armv7l/bootstrap-tools.tar.xz;
sha256 = "05ayki2kak3i5lw97qidd5h9jv00dmlhx9h7l771bj331yamyqdn";
url = https://cs.helsinki.fi/u/tmtynkky/tmp-bootstrap/stdenv-linux/armv7l/fd81a2ecb6b85594dc79ad53566c822849d4e47a/bootstrap-tools.tar.xz;
sha256 = "0yzw4jfgbf8xn9s34in0wza534xk4yvpx8cpsl6x1f3gss0cyw93";
};
}
9 changes: 4 additions & 5 deletions pkgs/stdenv/linux/bootstrap-files/i686.nix
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
{
busybox = import <nix/fetchurl.nix> {
url = http://tarballs.nixos.org/stdenv-linux/i686/4907fc9e8d0d82b28b3c56e3a478a2882f1d700f/busybox;
sha256 = "ef4c1be6c7ae57e4f654efd90ae2d2e204d6769364c46469fa9ff3761195cba1";
url = https://cs.helsinki.fi/u/tmtynkky/tmp-bootstrap/stdenv-linux/i686/fd81a2ecb6b85594dc79ad53566c822849d4e47a/busybox;
sha256 = "0jygn15rdqx1nv3za0i5znvjbrxb4by8ksxndxf1inwyly1wli3w";
executable = true;
};

bootstrapTools = import <nix/fetchurl.nix> {
url = http://tarballs.nixos.org/stdenv-linux/i686/4907fc9e8d0d82b28b3c56e3a478a2882f1d700f/bootstrap-tools.tar.xz;
sha256 = "cf920d26d94335f5cb46e247455d0e5389765d16a2b8fc233b792a655b5b58aa";
url = https://cs.helsinki.fi/u/tmtynkky/tmp-bootstrap/stdenv-linux/i686/fd81a2ecb6b85594dc79ad53566c822849d4e47a/bootstrap-tools.tar.xz;
sha256 = "0hwi9rapphrhnbamgj6ywbqm81pp0zc2g0lyimj4bnqnfkxbl4kz";
};
}
12 changes: 7 additions & 5 deletions pkgs/stdenv/linux/bootstrap-files/x86_64.nix
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
# Use busybox for i686-linux since it works on x86_64-linux as well.
(import ./i686.nix) //

{
busybox = import <nix/fetchurl.nix> {
url = https://cs.helsinki.fi/u/tmtynkky/tmp-bootstrap/stdenv-linux/x86_64/fd81a2ecb6b85594dc79ad53566c822849d4e47a/busybox;
sha256 = "17rbs7q9q8hhdbz7bwb97vzimbfmz6iy413i2gwzwlvvj62kn02k";
executable = true;
};
bootstrapTools = import <nix/fetchurl.nix> {
url = http://tarballs.nixos.org/stdenv-linux/x86_64/4907fc9e8d0d82b28b3c56e3a478a2882f1d700f/bootstrap-tools.tar.xz;
sha256 = "abe3f0727dd771a60b7922892d308da1bc7b082afc13440880862f0c8823c09f";
url = https://cs.helsinki.fi/u/tmtynkky/tmp-bootstrap/stdenv-linux/x86_64/fd81a2ecb6b85594dc79ad53566c822849d4e47a/bootstrap-tools.tar.xz;
sha256 = "0y9h4mixwa033rqb4al86pl6pbxgick5wmf27ppwyvgzw4srfslw";
};
}

0 comments on commit d9dd94a

Please sign in to comment.