Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: a94af71da71ebc4a52c002891d813cf2689fc950
      
https://github.com/NixOS/nixpkgs/commit/a94af71da71ebc4a52c002891d813cf2689fc950
  Author: John Ericson <jeric...@galois.com>
  Date:   2016-12-15 (Thu, 15 Dec 2016)

  Changed paths:
    M pkgs/stdenv/linux/make-bootstrap-tools.nix

  Log Message:
  -----------
  linux stdenv: Fix assert that broke tests...and hydra


  Commit: 670256dc399ab637fa94df9a90fb13f275c39f8a
      
https://github.com/NixOS/nixpkgs/commit/670256dc399ab637fa94df9a90fb13f275c39f8a
  Author: John Ericson <jeric...@galois.com>
  Date:   2016-12-15 (Thu, 15 Dec 2016)

  Changed paths:
    A pkgs/stdenv/linux/bootstrap-files/armv5tel.nix
    A pkgs/stdenv/linux/bootstrap-files/armv6l.nix
    A pkgs/stdenv/linux/bootstrap-files/armv7l.nix
    A pkgs/stdenv/linux/bootstrap-files/i686.nix
    A pkgs/stdenv/linux/bootstrap-files/loongson2f.nix
    A pkgs/stdenv/linux/bootstrap-files/x86_64.nix
    R pkgs/stdenv/linux/bootstrap/armv5tel.nix
    R pkgs/stdenv/linux/bootstrap/armv6l.nix
    R pkgs/stdenv/linux/bootstrap/armv7l.nix
    R pkgs/stdenv/linux/bootstrap/i686.nix
    R pkgs/stdenv/linux/bootstrap/loongson2f.nix
    R pkgs/stdenv/linux/bootstrap/x86_64.nix
    M pkgs/stdenv/linux/default.nix

  Log Message:
  -----------
  linux stdenv: Rename the `bootstrap` directory to `bootstrap-files`


  Commit: 7960a1b1b8fa1ca097bee2971fbbc18bda3dcadd
      
https://github.com/NixOS/nixpkgs/commit/7960a1b1b8fa1ca097bee2971fbbc18bda3dcadd
  Author: John Ericson <jeric...@galois.com>
  Date:   2016-12-15 (Thu, 15 Dec 2016)

  Changed paths:
    A pkgs/stdenv/linux/bootstrap-tools/default.nix
    A pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh
    M pkgs/stdenv/linux/default.nix
    M pkgs/stdenv/linux/make-bootstrap-tools.nix
    R pkgs/stdenv/linux/scripts/unpack-bootstrap-tools.sh

  Log Message:
  -----------
  linux stdenv: Avoid `assert false`

On one hand, don't want to pass garbage that affects hash, on the other
hand footguns are bad.

Now, factored out the derivation so only need to pass in what is used.


  Commit: 19fbe80c3d1f3b5888a3f78f2df2af07355ea498
      
https://github.com/NixOS/nixpkgs/commit/19fbe80c3d1f3b5888a3f78f2df2af07355ea498
  Author: John Ericson <jeric...@galois.com>
  Date:   2016-12-15 (Thu, 15 Dec 2016)

  Changed paths:
    M pkgs/stdenv/darwin/make-bootstrap-tools.nix
    M pkgs/top-level/default.nix

  Log Message:
  -----------
  top-level: avoid another `assert false` while we're at it


  Commit: 63bf5f3ba37b3eb39f61eb3e177844c1a811e3e6
      
https://github.com/NixOS/nixpkgs/commit/63bf5f3ba37b3eb39f61eb3e177844c1a811e3e6
  Author: John Ericson <ericson2...@yahoo.com>
  Date:   2016-12-15 (Thu, 15 Dec 2016)

  Changed paths:
    M pkgs/stdenv/darwin/make-bootstrap-tools.nix
    A pkgs/stdenv/linux/bootstrap-files/armv5tel.nix
    A pkgs/stdenv/linux/bootstrap-files/armv6l.nix
    A pkgs/stdenv/linux/bootstrap-files/armv7l.nix
    A pkgs/stdenv/linux/bootstrap-files/i686.nix
    A pkgs/stdenv/linux/bootstrap-files/loongson2f.nix
    A pkgs/stdenv/linux/bootstrap-files/x86_64.nix
    A pkgs/stdenv/linux/bootstrap-tools/default.nix
    A pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh
    R pkgs/stdenv/linux/bootstrap/armv5tel.nix
    R pkgs/stdenv/linux/bootstrap/armv6l.nix
    R pkgs/stdenv/linux/bootstrap/armv7l.nix
    R pkgs/stdenv/linux/bootstrap/i686.nix
    R pkgs/stdenv/linux/bootstrap/loongson2f.nix
    R pkgs/stdenv/linux/bootstrap/x86_64.nix
    M pkgs/stdenv/linux/default.nix
    M pkgs/stdenv/linux/make-bootstrap-tools.nix
    R pkgs/stdenv/linux/scripts/unpack-bootstrap-tools.sh
    M pkgs/top-level/default.nix

  Log Message:
  -----------
  Merge pull request #21189 from Ericson2314/mea-culpa

Mea culpa. Tests should pass now


Compare: https://github.com/NixOS/nixpkgs/compare/4af2328e5cbf...63bf5f3ba37b
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

Reply via email to