[Nix-commits] [NixOS/nixpkgs] 95c827: misc pkgs: Remove unneeded *Platform == *Platform ...

2017-06-30 Thread John Ericson
  Branch: refs/heads/staging
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 95c8277701fb746ad4d91841de494ee869886991
  
https://github.com/NixOS/nixpkgs/commit/95c8277701fb746ad4d91841de494ee869886991
  Author: John Ericson 
  Date:   2017-06-30 (Fri, 30 Jun 2017)

  Changed paths:
M pkgs/applications/audio/mpg123/default.nix
M pkgs/applications/editors/ed/default.nix
M pkgs/development/compilers/rust/rustc.nix
M pkgs/development/libraries/glew/1.10.nix
M pkgs/development/libraries/glew/default.nix
R pkgs/development/libraries/libelf/cross-ar.patch
M pkgs/development/libraries/libelf/default.nix
A pkgs/development/libraries/libelf/dont-hardcode-ar.patch
M pkgs/development/libraries/zlib/default.nix
M pkgs/development/tools/misc/binutils/default.nix
M pkgs/development/tools/misc/gdb/default.nix
M pkgs/os-specific/darwin/binutils/default.nix
M pkgs/os-specific/darwin/cctools/port.nix
M pkgs/os-specific/linux/busybox/default.nix
R pkgs/tools/archivers/unzip/cross-cc.patch
M pkgs/tools/archivers/unzip/default.nix
A pkgs/tools/archivers/unzip/dont-hardcode-cc.patch
M pkgs/tools/misc/coreutils/default.nix
M pkgs/tools/system/ddrescue/default.nix
M pkgs/tools/text/gnupatch/default.nix

  Log Message:
  ---
  misc pkgs: Remove unneeded *Platform == *Platform comparisons

PR #26007 used these to avoid causing a mass rebuild. Now that we know
things work, we do that to clean up.


  Commit: c53449ce57f26de17532f0dea727b58db68b337e
  
https://github.com/NixOS/nixpkgs/commit/c53449ce57f26de17532f0dea727b58db68b337e
  Author: John Ericson 
  Date:   2017-06-30 (Fri, 30 Jun 2017)

  Changed paths:
M pkgs/applications/audio/mpg123/default.nix
M pkgs/applications/editors/ed/default.nix
M pkgs/development/compilers/rust/rustc.nix
M pkgs/development/libraries/glew/1.10.nix
M pkgs/development/libraries/glew/default.nix
R pkgs/development/libraries/libelf/cross-ar.patch
M pkgs/development/libraries/libelf/default.nix
A pkgs/development/libraries/libelf/dont-hardcode-ar.patch
M pkgs/development/libraries/zlib/default.nix
M pkgs/development/tools/misc/binutils/default.nix
M pkgs/development/tools/misc/gdb/default.nix
M pkgs/os-specific/darwin/binutils/default.nix
M pkgs/os-specific/darwin/cctools/port.nix
M pkgs/os-specific/linux/busybox/default.nix
R pkgs/tools/archivers/unzip/cross-cc.patch
M pkgs/tools/archivers/unzip/default.nix
A pkgs/tools/archivers/unzip/dont-hardcode-cc.patch
M pkgs/tools/misc/coreutils/default.nix
M pkgs/tools/system/ddrescue/default.nix
M pkgs/tools/text/gnupatch/default.nix

  Log Message:
  ---
  Merge pull request #26881 from obsidiansystems/cross-hashbreak

Make hash-breaking cleanups avoided in #26007


Compare: https://github.com/NixOS/nixpkgs/compare/d61c22341b00...c53449ce57f2___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] ad8d8f: stdenv: Simplify dependency code

2017-06-29 Thread John Ericson
  Branch: refs/heads/staging
  Home:   https://github.com/NixOS/nixpkgs
  Commit: ad8d8fb2f5f42414bb84feaed450ef6e24d89281
  
https://github.com/NixOS/nixpkgs/commit/ad8d8fb2f5f42414bb84feaed450ef6e24d89281
  Author: John Ericson 
  Date:   2017-06-29 (Thu, 29 Jun 2017)

  Changed paths:
M pkgs/stdenv/generic/default.nix

  Log Message:
  ---
  stdenv: Simplify dependency code

This is a bit simpler now, but more importantly it scales better when I
double the number of sorts of dependencies as part of my cross
compilation work.


  Commit: d61c22341b00171b53697164cb8241184979d14c
  
https://github.com/NixOS/nixpkgs/commit/d61c22341b00171b53697164cb8241184979d14c
  Author: John Ericson 
  Date:   2017-06-29 (Thu, 29 Jun 2017)

  Changed paths:
M pkgs/stdenv/generic/default.nix

  Log Message:
  ---
  Merge accepted cross compilation PRs into staging


Compare: https://github.com/NixOS/nixpkgs/compare/16be434b0bec...d61c22341b00___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] ad8d8f: stdenv: Simplify dependency code

2017-06-29 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: ad8d8fb2f5f42414bb84feaed450ef6e24d89281
  
https://github.com/NixOS/nixpkgs/commit/ad8d8fb2f5f42414bb84feaed450ef6e24d89281
  Author: John Ericson 
  Date:   2017-06-29 (Thu, 29 Jun 2017)

  Changed paths:
M pkgs/stdenv/generic/default.nix

  Log Message:
  ---
  stdenv: Simplify dependency code

This is a bit simpler now, but more importantly it scales better when I
double the number of sorts of dependencies as part of my cross
compilation work.


  Commit: dc9f69c260139c23fa4944826acc3d46ef1a3237
  
https://github.com/NixOS/nixpkgs/commit/dc9f69c260139c23fa4944826acc3d46ef1a3237
  Author: John Ericson 
  Date:   2017-06-29 (Thu, 29 Jun 2017)

  Changed paths:
M pkgs/stdenv/generic/default.nix

  Log Message:
  ---
  Merge pull request #26948 from obsidiansystems/stdenv-map

stdenv: Simplify dependency code


Compare: https://github.com/NixOS/nixpkgs/compare/c4430ba2489b...dc9f69c26013___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 8ca829: libxml2: Don't use stdenv.cross

2017-06-28 Thread John Ericson
  Branch: refs/heads/staging
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 8ca8293dbc5982684d0ce87babf3daf7729e549a
  
https://github.com/NixOS/nixpkgs/commit/8ca8293dbc5982684d0ce87babf3daf7729e549a
  Author: John Ericson 
  Date:   2017-06-28 (Wed, 28 Jun 2017)

  Changed paths:
M pkgs/development/libraries/libxml2/default.nix

  Log Message:
  ---
  libxml2: Don't use stdenv.cross


  Commit: 099b83f90d8996fcae2a03e5c85f13a8a3341d72
  
https://github.com/NixOS/nixpkgs/commit/099b83f90d8996fcae2a03e5c85f13a8a3341d72
  Author: John Ericson 
  Date:   2017-06-28 (Wed, 28 Jun 2017)

  Changed paths:
M pkgs/development/libraries/libxslt/default.nix

  Log Message:
  ---
  libxslt: Don't use stdenv.cross


  Commit: a11426c52376d0d6b82d24519a333a3c1f7dec71
  
https://github.com/NixOS/nixpkgs/commit/a11426c52376d0d6b82d24519a333a3c1f7dec71
  Author: John Ericson 
  Date:   2017-06-28 (Wed, 28 Jun 2017)

  Changed paths:
M pkgs/applications/graphics/ImageMagick/7.0.nix
M pkgs/applications/graphics/ImageMagick/default.nix

  Log Message:
  ---
  ImageMagick: Don't use stdenv.cross

I'm guessing the salient aspect here is not cross compiling itself, but
just whether the host platform is MinGW, so I simplified the logic
accordingly


  Commit: c4443d70df83bc9591cdf892a3f2b7c7d98fffbb
  
https://github.com/NixOS/nixpkgs/commit/c4443d70df83bc9591cdf892a3f2b7c7d98fffbb
  Author: John Ericson 
  Date:   2017-06-28 (Wed, 28 Jun 2017)

  Changed paths:
M pkgs/applications/graphics/fbida/default.nix

  Log Message:
  ---
  fbida: cc-wrapper can be relied on to export these env vars


  Commit: ca94de8c4c87f1cace032ccaa8e922e2db9405bb
  
https://github.com/NixOS/nixpkgs/commit/ca94de8c4c87f1cace032ccaa8e922e2db9405bb
  Author: John Ericson 
  Date:   2017-06-28 (Wed, 28 Jun 2017)

  Changed paths:
M pkgs/applications/networking/offrss/default.nix

  Log Message:
  ---
  offrss: cc-wrapper can be relied on to export this env var


  Commit: ffa535a0cc321a502d49240c859f2a761f0455d9
  
https://github.com/NixOS/nixpkgs/commit/ffa535a0cc321a502d49240c859f2a761f0455d9
  Author: John Ericson 
  Date:   2017-06-28 (Wed, 28 Jun 2017)

  Changed paths:
M pkgs/applications/version-management/fossil/default.nix

  Log Message:
  ---
  fossil: Don't use stdenv.cross


  Commit: 9c163cebdd5924b223745ec59928f456cd4587fc
  
https://github.com/NixOS/nixpkgs/commit/9c163cebdd5924b223745ec59928f456cd4587fc
  Author: John Ericson 
  Date:   2017-06-28 (Wed, 28 Jun 2017)

  Changed paths:
M pkgs/applications/video/omxplayer/default.nix

  Log Message:
  ---
  omxplayer: Don't use stdenv.cross


  Commit: deb8fae4c0b65f0b70642518a221db54058d2cac
  
https://github.com/NixOS/nixpkgs/commit/deb8fae4c0b65f0b70642518a221db54058d2cac
  Author: John Ericson 
  Date:   2017-06-28 (Wed, 28 Jun 2017)

  Changed paths:
M pkgs/build-support/kernel/make-initrd.nix

  Log Message:
  ---
  make-initrd: Don't use stdenv.cross


  Commit: c3c5793ab29d3fe8b3c0faff2ad644cfe91618b9
  
https://github.com/NixOS/nixpkgs/commit/c3c5793ab29d3fe8b3c0faff2ad644cfe91618b9
  Author: John Ericson 
  Date:   2017-06-28 (Wed, 28 Jun 2017)

  Changed paths:
M pkgs/development/interpreters/guile/2.0.nix
M pkgs/development/interpreters/guile/default.nix

  Log Message:
  ---
  guile: Don't use stdenv.cross


  Commit: 5d1e51a199917fa945cb59567597e354c6e4f56d
  
https://github.com/NixOS/nixpkgs/commit/5d1e51a199917fa945cb59567597e354c6e4f56d
  Author: John Ericson 
  Date:   2017-06-28 (Wed, 28 Jun 2017)

  Changed paths:
M pkgs/development/interpreters/lua-5/5.2.nix
M pkgs/development/interpreters/lua-5/5.3.nix

  Log Message:
  ---
  lua 5: Don't use stdenv.cross, and use less make flags

cc-wrapper will define environment variables matching those now


  Commit: 80a857f8d7b797cfd661e2686c0f2e66d41255b5
  
https://github.com/NixOS/nixpkgs/commit/80a857f8d7b797cfd661e2686c0f2e66d41255b5
  Author: John Ericson 
  Date:   2017-06-28 (Wed, 28 Jun 2017)

  Changed paths:
M pkgs/development/libraries/SDL/default.nix

  Log Message:
  ---
  SDL: Don't use stdenv.cross


  Commit: 67b5f39c7288073909302bc6ce2e7df094874c24
  
https://github.com/NixOS/nixpkgs/commit/67b5f39c7288073909302bc6ce2e7df094874c24
  Author: John Ericson 
  Date:   2017-06-28 (Wed, 28 Jun 2017)

  Changed paths:
M pkgs/games/scummvm/default.nix

  Log Message:
  ---
  scummvm: Don't use stdenv.cross


  Commit: fcef0add76de4728b11cf9acba840a7e7d06abbb
  
https://github.com/NixOS/nixpkgs/commit/fcef0add76de4728b11cf9acba840a7e7d06abbb
  Author: John Ericson 
  Date:   2017-06-28 (Wed, 28 Jun 2017)

  Changed paths:
M pkgs/development/libraries/boost/generic.nix

  Log Message:
  ---
  boost: Don't us

[Nix-commits] [NixOS/nixpkgs] b0ada0: wxMSW: Fix syntax --- travis eval did not catch

2017-06-28 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: b0ada07f36abc21c99b5cdbe780157d6b92b
  
https://github.com/NixOS/nixpkgs/commit/b0ada07f36abc21c99b5cdbe780157d6b92b
  Author: John Ericson 
  Date:   2017-06-28 (Wed, 28 Jun 2017)

  Changed paths:
M pkgs/os-specific/windows/wxMSW-2.8/default.nix

  Log Message:
  ---
  wxMSW: Fix syntax --- travis eval did not catch


  Commit: eb052edd6fca60ea5d368547e3ff308adbe305cc
  
https://github.com/NixOS/nixpkgs/commit/eb052edd6fca60ea5d368547e3ff308adbe305cc
  Author: John Ericson 
  Date:   2017-06-28 (Wed, 28 Jun 2017)

  Changed paths:
M pkgs/os-specific/windows/wxMSW-2.8/default.nix

  Log Message:
  ---
  Merge pull request #26946 from obsidiansystems/wxmsw-fix

wxMSW: Fix syntax --- travis eval did not catch


Compare: https://github.com/NixOS/nixpkgs/compare/db17c508ef01...eb052edd6fca___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 8ca829: libxml2: Don't use stdenv.cross

2017-06-28 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 8ca8293dbc5982684d0ce87babf3daf7729e549a
  
https://github.com/NixOS/nixpkgs/commit/8ca8293dbc5982684d0ce87babf3daf7729e549a
  Author: John Ericson 
  Date:   2017-06-28 (Wed, 28 Jun 2017)

  Changed paths:
M pkgs/development/libraries/libxml2/default.nix

  Log Message:
  ---
  libxml2: Don't use stdenv.cross


  Commit: 099b83f90d8996fcae2a03e5c85f13a8a3341d72
  
https://github.com/NixOS/nixpkgs/commit/099b83f90d8996fcae2a03e5c85f13a8a3341d72
  Author: John Ericson 
  Date:   2017-06-28 (Wed, 28 Jun 2017)

  Changed paths:
M pkgs/development/libraries/libxslt/default.nix

  Log Message:
  ---
  libxslt: Don't use stdenv.cross


  Commit: a11426c52376d0d6b82d24519a333a3c1f7dec71
  
https://github.com/NixOS/nixpkgs/commit/a11426c52376d0d6b82d24519a333a3c1f7dec71
  Author: John Ericson 
  Date:   2017-06-28 (Wed, 28 Jun 2017)

  Changed paths:
M pkgs/applications/graphics/ImageMagick/7.0.nix
M pkgs/applications/graphics/ImageMagick/default.nix

  Log Message:
  ---
  ImageMagick: Don't use stdenv.cross

I'm guessing the salient aspect here is not cross compiling itself, but
just whether the host platform is MinGW, so I simplified the logic
accordingly


  Commit: c4443d70df83bc9591cdf892a3f2b7c7d98fffbb
  
https://github.com/NixOS/nixpkgs/commit/c4443d70df83bc9591cdf892a3f2b7c7d98fffbb
  Author: John Ericson 
  Date:   2017-06-28 (Wed, 28 Jun 2017)

  Changed paths:
M pkgs/applications/graphics/fbida/default.nix

  Log Message:
  ---
  fbida: cc-wrapper can be relied on to export these env vars


  Commit: ca94de8c4c87f1cace032ccaa8e922e2db9405bb
  
https://github.com/NixOS/nixpkgs/commit/ca94de8c4c87f1cace032ccaa8e922e2db9405bb
  Author: John Ericson 
  Date:   2017-06-28 (Wed, 28 Jun 2017)

  Changed paths:
M pkgs/applications/networking/offrss/default.nix

  Log Message:
  ---
  offrss: cc-wrapper can be relied on to export this env var


  Commit: ffa535a0cc321a502d49240c859f2a761f0455d9
  
https://github.com/NixOS/nixpkgs/commit/ffa535a0cc321a502d49240c859f2a761f0455d9
  Author: John Ericson 
  Date:   2017-06-28 (Wed, 28 Jun 2017)

  Changed paths:
M pkgs/applications/version-management/fossil/default.nix

  Log Message:
  ---
  fossil: Don't use stdenv.cross


  Commit: 9c163cebdd5924b223745ec59928f456cd4587fc
  
https://github.com/NixOS/nixpkgs/commit/9c163cebdd5924b223745ec59928f456cd4587fc
  Author: John Ericson 
  Date:   2017-06-28 (Wed, 28 Jun 2017)

  Changed paths:
M pkgs/applications/video/omxplayer/default.nix

  Log Message:
  ---
  omxplayer: Don't use stdenv.cross


  Commit: deb8fae4c0b65f0b70642518a221db54058d2cac
  
https://github.com/NixOS/nixpkgs/commit/deb8fae4c0b65f0b70642518a221db54058d2cac
  Author: John Ericson 
  Date:   2017-06-28 (Wed, 28 Jun 2017)

  Changed paths:
M pkgs/build-support/kernel/make-initrd.nix

  Log Message:
  ---
  make-initrd: Don't use stdenv.cross


  Commit: c3c5793ab29d3fe8b3c0faff2ad644cfe91618b9
  
https://github.com/NixOS/nixpkgs/commit/c3c5793ab29d3fe8b3c0faff2ad644cfe91618b9
  Author: John Ericson 
  Date:   2017-06-28 (Wed, 28 Jun 2017)

  Changed paths:
M pkgs/development/interpreters/guile/2.0.nix
M pkgs/development/interpreters/guile/default.nix

  Log Message:
  ---
  guile: Don't use stdenv.cross


  Commit: 5d1e51a199917fa945cb59567597e354c6e4f56d
  
https://github.com/NixOS/nixpkgs/commit/5d1e51a199917fa945cb59567597e354c6e4f56d
  Author: John Ericson 
  Date:   2017-06-28 (Wed, 28 Jun 2017)

  Changed paths:
M pkgs/development/interpreters/lua-5/5.2.nix
M pkgs/development/interpreters/lua-5/5.3.nix

  Log Message:
  ---
  lua 5: Don't use stdenv.cross, and use less make flags

cc-wrapper will define environment variables matching those now


  Commit: 80a857f8d7b797cfd661e2686c0f2e66d41255b5
  
https://github.com/NixOS/nixpkgs/commit/80a857f8d7b797cfd661e2686c0f2e66d41255b5
  Author: John Ericson 
  Date:   2017-06-28 (Wed, 28 Jun 2017)

  Changed paths:
M pkgs/development/libraries/SDL/default.nix

  Log Message:
  ---
  SDL: Don't use stdenv.cross


  Commit: 67b5f39c7288073909302bc6ce2e7df094874c24
  
https://github.com/NixOS/nixpkgs/commit/67b5f39c7288073909302bc6ce2e7df094874c24
  Author: John Ericson 
  Date:   2017-06-28 (Wed, 28 Jun 2017)

  Changed paths:
M pkgs/games/scummvm/default.nix

  Log Message:
  ---
  scummvm: Don't use stdenv.cross


  Commit: fcef0add76de4728b11cf9acba840a7e7d06abbb
  
https://github.com/NixOS/nixpkgs/commit/fcef0add76de4728b11cf9acba840a7e7d06abbb
  Author: John Ericson 
  Date:   2017-06-28 (Wed, 28 Jun 2017)

  Changed paths:
M pkgs/development/libraries/boost/generic.nix

  Log Message:
  ---
  boost: Don't us

[Nix-commits] [NixOS/nixpkgs] cdc5cf: cygwin: rebase fixes

2017-06-26 Thread John Ericson
s://github.com/NixOS/nixpkgs/commit/84a4ee5c041697fd25d4082a0f94ec1d82406017
  Author: David McFarland 
  Date:   2017-06-26 (Mon, 26 Jun 2017)

  Changed paths:
M pkgs/servers/gpm/default.nix

  Log Message:
  ---
  gpm: allow cygwin


  Commit: 260afef6679952fd70e9f2a7a41d54e760b21ca5
  
https://github.com/NixOS/nixpkgs/commit/260afef6679952fd70e9f2a7a41d54e760b21ca5
  Author: David McFarland 
  Date:   2017-06-26 (Mon, 26 Jun 2017)

  Changed paths:
M pkgs/development/libraries/libiconv/default.nix
R pkgs/development/libraries/libiconv/libiconv-1.14-reloc.patch
R pkgs/development/libraries/libiconv/libiconv-1.14-wchar.patch

  Log Message:
  ---
  libiconv: remove old cygwin hacks


  Commit: b92840487edda418c304c0ef361e673eb85c51d5
  
https://github.com/NixOS/nixpkgs/commit/b92840487edda418c304c0ef361e673eb85c51d5
  Author: David McFarland 
  Date:   2017-06-26 (Mon, 26 Jun 2017)

  Changed paths:
M pkgs/development/libraries/gettext/default.nix

  Log Message:
  ---
  gettext: fix cygwin build


  Commit: c580ab4fcf18db191fba337ca41757ff0c9cfc14
  
https://github.com/NixOS/nixpkgs/commit/c580ab4fcf18db191fba337ca41757ff0c9cfc14
  Author: David McFarland 
  Date:   2017-06-26 (Mon, 26 Jun 2017)

  Changed paths:
R pkgs/development/libraries/openssl/1.0.1-cygwin64.patch
M pkgs/development/libraries/openssl/default.nix

  Log Message:
  ---
  openssl: fix cygwin build


  Commit: cbc0db08f948a762ee4b3f7f9ded47a034f5d9fa
  
https://github.com/NixOS/nixpkgs/commit/cbc0db08f948a762ee4b3f7f9ded47a034f5d9fa
  Author: David McFarland 
  Date:   2017-06-26 (Mon, 26 Jun 2017)

  Changed paths:
M pkgs/development/libraries/zlib/default.nix
A pkgs/development/libraries/zlib/disable-cygwin-widechar.patch

  Log Message:
  ---
  zlib: fix cygwin build


  Commit: f81117e324501530ce8ecec6a94846fae78e413e
  
https://github.com/NixOS/nixpkgs/commit/f81117e324501530ce8ecec6a94846fae78e413e
  Author: David McFarland 
  Date:   2017-06-26 (Mon, 26 Jun 2017)

  Changed paths:
M pkgs/stdenv/native/default.nix

  Log Message:
  ---
  stdenv: remove leftover 'system' reference

the rest were removed in 1dc6f15de995da2d0351b34c40215336e219cf82


  Commit: f4a2351b2b8f89797528fd6d40d502c23d132e44
  
https://github.com/NixOS/nixpkgs/commit/f4a2351b2b8f89797528fd6d40d502c23d132e44
  Author: David McFarland 
  Date:   2017-06-26 (Mon, 26 Jun 2017)

  Changed paths:
M pkgs/development/libraries/gdbm/default.nix

  Log Message:
  ---
  gdbm: fix cygwin build


  Commit: bf517c1c16e49f25aca3318ad03335e3b39f2929
  
https://github.com/NixOS/nixpkgs/commit/bf517c1c16e49f25aca3318ad03335e3b39f2929
  Author: David McFarland 
  Date:   2017-06-26 (Mon, 26 Jun 2017)

  Changed paths:
M pkgs/development/tools/misc/pkgconfig/2.36.3-not-win32.patch
M pkgs/development/tools/misc/pkgconfig/default.nix

  Log Message:
  ---
  pkgconfig: fix cygwin build


  Commit: be75c5dffbc236e80d382237209434a05344f2a7
  
https://github.com/NixOS/nixpkgs/commit/be75c5dffbc236e80d382237209434a05344f2a7
  Author: David McFarland 
  Date:   2017-06-26 (Mon, 26 Jun 2017)

  Changed paths:
M lib/systems/parse.nix

  Log Message:
  ---
  cygwin: fix doubleFromSystem for cygwin


  Commit: 4ac1901d54f4301df2f09b85e2f69769ee61dfc1
  
https://github.com/NixOS/nixpkgs/commit/4ac1901d54f4301df2f09b85e2f69769ee61dfc1
  Author: David McFarland 
  Date:   2017-06-26 (Mon, 26 Jun 2017)

  Changed paths:
M lib/systems/inspect.nix
M lib/systems/parse.nix

  Log Message:
  ---
  stdenv: remove unix kernel family

System predicate patterns can now be specified as a list of OR'd
attribute sets.


  Commit: 63a1a2ac63451fc47a5992f8e04e42843f019ecd
  
https://github.com/NixOS/nixpkgs/commit/63a1a2ac63451fc47a5992f8e04e42843f019ecd
  Author: David McFarland 
  Date:   2017-06-26 (Mon, 26 Jun 2017)

  Changed paths:
M pkgs/build-support/cc-wrapper/default.nix

  Log Message:
  ---
  stdenv: disable -fPIC on cygwin

It's always on, and you get a warning if you specify it


  Commit: b686fd157062c9b738393c13b8c59f5685462fd2
  
https://github.com/NixOS/nixpkgs/commit/b686fd157062c9b738393c13b8c59f5685462fd2
  Author: John Ericson 
  Date:   2017-06-26 (Mon, 26 Jun 2017)

  Changed paths:
M lib/systems/inspect.nix
M lib/systems/parse.nix
R pkgs/applications/networking/browsers/w3m/cygwin.patch
M pkgs/applications/networking/browsers/w3m/default.nix
M pkgs/build-support/cc-wrapper/default.nix
M pkgs/build-support/setup-hooks/win-dll-link.sh
M pkgs/development/interpreters/python/cpython/2.7/default.nix
M pkgs/development/libraries/gdbm/default.nix
M pkgs/development/libraries/gettext/default.nix
M pkgs/development/libraries/glib/default.nix
M pkgs/development/libraries/libiconv/default.nix
R pkgs/development/libraries/libic

[Nix-commits] [NixOS/nixpkgs] 8f970d: ghcHEAD: Actually split docs into their own output

2017-06-23 Thread John Ericson
  Branch: refs/heads/staging
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 8f970d09fe8e895b6bb7dbf52f80411a45504b19
  
https://github.com/NixOS/nixpkgs/commit/8f970d09fe8e895b6bb7dbf52f80411a45504b19
  Author: John Ericson 
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
M pkgs/development/compilers/ghc/head.nix

  Log Message:
  ---
  ghcHEAD: Actually split docs into their own output

I put `outputs = ...` in the wrong spot in the last PR, oops. Sorry
about that.


  Commit: c4ba2e3ef691c349bcce2b1e8b76a0bcd253544c
  
https://github.com/NixOS/nixpkgs/commit/c4ba2e3ef691c349bcce2b1e8b76a0bcd253544c
  Author: John Ericson 
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
M pkgs/build-support/cc-wrapper/default.nix
M pkgs/stdenv/darwin/default.nix
M pkgs/stdenv/freebsd/default.nix
M pkgs/stdenv/linux/default.nix
M pkgs/stdenv/native/default.nix
M pkgs/stdenv/nix/default.nix

  Log Message:
  ---
  cc-wrapper: Remove `stdenv.is*` for `targetPlatform.is*`

Modify bootstrapping stdenvs to make sure `targetPlatform` also passed.


  Commit: 459f1c60f5e53acb96123a7da8463d1e21093426
  
https://github.com/NixOS/nixpkgs/commit/459f1c60f5e53acb96123a7da8463d1e21093426
  Author: John Ericson 
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
M pkgs/build-support/cc-wrapper/default.nix
M pkgs/stdenv/darwin/default.nix
M pkgs/stdenv/freebsd/default.nix
M pkgs/stdenv/linux/default.nix
M pkgs/stdenv/native/default.nix
M pkgs/stdenv/nix/default.nix

  Log Message:
  ---
  cc-wrapper: Learn about target prefixes

This is first step towards getting rid of gcc-wrapper-cross


  Commit: d70e7263f47e890a350f50686bbf38e5f342cf37
  
https://github.com/NixOS/nixpkgs/commit/d70e7263f47e890a350f50686bbf38e5f342cf37
  Author: John Ericson 
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
M pkgs/build-support/cc-wrapper/default.nix

  Log Message:
  ---
  cc-wrapper: Simplify and correct logic to chose dynamic linker library


  Commit: 04a3cad968fccc11fd07997cd5b496f4c482aae7
  
https://github.com/NixOS/nixpkgs/commit/04a3cad968fccc11fd07997cd5b496f4c482aae7
  Author: John Ericson 
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
M pkgs/build-support/cc-wrapper/default.nix

  Log Message:
  ---
  cc-wrapper: Add support for no libc whatsoever


  Commit: 0f0383394d006ae1c67e2815d5b4a8e4c7788de0
  
https://github.com/NixOS/nixpkgs/commit/0f0383394d006ae1c67e2815d5b4a8e4c7788de0
  Author: John Ericson 
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
M pkgs/build-support/cc-wrapper/default.nix

  Log Message:
  ---
  cc-wrapper: Salt environment variables with LLVM triples

We now (on cross) require per-target flag interposition by putting the
triple in the names of the relevant environment variables, e.g:

export NIX_arm_unknown_linux_gnu_CFLAGS_COMPILE=...

The wrapper also has a `infixSalt` attribute (and "_" prefixed and
suffixed variants) to assist downstream packages.

Note how that the dashes are replaced to keep the identifier valid.
Using names like this allows us to keep the settings for different
compilers seperate.

I think it might be even better to use names like `NIX_{BUILD,HOST}...`
using the platform's role rather than the platform itself, but this
would be more work as the previous stages' tools would have to be re-
wrapped to take on their new role. I therefore didn't do this for now,
but that route should be thoroughly explored in the future.


  Commit: 8a7433fca4d08ee6654df498e0f238f0dfab01be
  
https://github.com/NixOS/nixpkgs/commit/8a7433fca4d08ee6654df498e0f238f0dfab01be
  Author: John Ericson 
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
M pkgs/build-support/cc-wrapper/default.nix

  Log Message:
  ---
  cc-wrapper: Temporarily got to great lengths to avoid mass-rebuild

Eventually we should avoid this "pre-wrapping" and just update those
files in nixpkgs. This mass-rebuild change is best done along with
those needed to reduce the disparity between native and cross (i.e.
making native the "identity cross").


  Commit: 121e7d9335187fa742abba7994e03b495b8f2a6c
  
https://github.com/NixOS/nixpkgs/commit/121e7d9335187fa742abba7994e03b495b8f2a6c
  Author: John Ericson 
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
R pkgs/build-support/gcc-cross-wrapper/add-flags
R pkgs/build-support/gcc-cross-wrapper/builder.sh
R pkgs/build-support/gcc-cross-wrapper/default.nix
R pkgs/build-support/gcc-cross-wrapper/gcc-wrapper.sh
R pkgs/build-support/gcc-cross-wrapper/ld-wrapper.sh
R pkgs/build-support/gcc-cross-wrapper/setup-hook.sh
R pkgs/build-support/gcc-cross-wrapper/utils.sh
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  gcc-cross-wrapper: Remove in favor of n

[Nix-commits] [NixOS/nixpkgs] f43ae9: ios-cross: Just properly use the cc-wrapper

2017-06-23 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: f43ae985a68e515197c57de5ab8413d63ae6ef1a
  
https://github.com/NixOS/nixpkgs/commit/f43ae985a68e515197c57de5ab8413d63ae6ef1a
  Author: John Ericson 
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
M pkgs/os-specific/darwin/ios-cross/default.nix

  Log Message:
  ---
  ios-cross: Just properly use the cc-wrapper

No other downstream derivations are needed anymore.


  Commit: a24031317ae74400473013b91543b03a24ec3872
  
https://github.com/NixOS/nixpkgs/commit/a24031317ae74400473013b91543b03a24ec3872
  Author: John Ericson 
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
M pkgs/os-specific/darwin/ios-cross/default.nix

  Log Message:
  ---
  Merge pull request #26798 from obsidiansystems/ios-cross-stdenv

ios-cross: Just properly use the cc-wrapper


Compare: https://github.com/NixOS/nixpkgs/compare/54a370ff5f21...a24031317ae7___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] c4ba2e: cc-wrapper: Remove `stdenv.is*` for `targetPlatfor...

2017-06-23 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: c4ba2e3ef691c349bcce2b1e8b76a0bcd253544c
  
https://github.com/NixOS/nixpkgs/commit/c4ba2e3ef691c349bcce2b1e8b76a0bcd253544c
  Author: John Ericson 
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
M pkgs/build-support/cc-wrapper/default.nix
M pkgs/stdenv/darwin/default.nix
M pkgs/stdenv/freebsd/default.nix
M pkgs/stdenv/linux/default.nix
M pkgs/stdenv/native/default.nix
M pkgs/stdenv/nix/default.nix

  Log Message:
  ---
  cc-wrapper: Remove `stdenv.is*` for `targetPlatform.is*`

Modify bootstrapping stdenvs to make sure `targetPlatform` also passed.


  Commit: 459f1c60f5e53acb96123a7da8463d1e21093426
  
https://github.com/NixOS/nixpkgs/commit/459f1c60f5e53acb96123a7da8463d1e21093426
  Author: John Ericson 
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
M pkgs/build-support/cc-wrapper/default.nix
M pkgs/stdenv/darwin/default.nix
M pkgs/stdenv/freebsd/default.nix
M pkgs/stdenv/linux/default.nix
M pkgs/stdenv/native/default.nix
M pkgs/stdenv/nix/default.nix

  Log Message:
  ---
  cc-wrapper: Learn about target prefixes

This is first step towards getting rid of gcc-wrapper-cross


  Commit: d70e7263f47e890a350f50686bbf38e5f342cf37
  
https://github.com/NixOS/nixpkgs/commit/d70e7263f47e890a350f50686bbf38e5f342cf37
  Author: John Ericson 
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
M pkgs/build-support/cc-wrapper/default.nix

  Log Message:
  ---
  cc-wrapper: Simplify and correct logic to chose dynamic linker library


  Commit: 04a3cad968fccc11fd07997cd5b496f4c482aae7
  
https://github.com/NixOS/nixpkgs/commit/04a3cad968fccc11fd07997cd5b496f4c482aae7
  Author: John Ericson 
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
M pkgs/build-support/cc-wrapper/default.nix

  Log Message:
  ---
  cc-wrapper: Add support for no libc whatsoever


  Commit: 0f0383394d006ae1c67e2815d5b4a8e4c7788de0
  
https://github.com/NixOS/nixpkgs/commit/0f0383394d006ae1c67e2815d5b4a8e4c7788de0
  Author: John Ericson 
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
M pkgs/build-support/cc-wrapper/default.nix

  Log Message:
  ---
  cc-wrapper: Salt environment variables with LLVM triples

We now (on cross) require per-target flag interposition by putting the
triple in the names of the relevant environment variables, e.g:

export NIX_arm_unknown_linux_gnu_CFLAGS_COMPILE=...

The wrapper also has a `infixSalt` attribute (and "_" prefixed and
suffixed variants) to assist downstream packages.

Note how that the dashes are replaced to keep the identifier valid.
Using names like this allows us to keep the settings for different
compilers seperate.

I think it might be even better to use names like `NIX_{BUILD,HOST}...`
using the platform's role rather than the platform itself, but this
would be more work as the previous stages' tools would have to be re-
wrapped to take on their new role. I therefore didn't do this for now,
but that route should be thoroughly explored in the future.


  Commit: 8a7433fca4d08ee6654df498e0f238f0dfab01be
  
https://github.com/NixOS/nixpkgs/commit/8a7433fca4d08ee6654df498e0f238f0dfab01be
  Author: John Ericson 
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
M pkgs/build-support/cc-wrapper/default.nix

  Log Message:
  ---
  cc-wrapper: Temporarily got to great lengths to avoid mass-rebuild

Eventually we should avoid this "pre-wrapping" and just update those
files in nixpkgs. This mass-rebuild change is best done along with
those needed to reduce the disparity between native and cross (i.e.
making native the "identity cross").


  Commit: 121e7d9335187fa742abba7994e03b495b8f2a6c
  
https://github.com/NixOS/nixpkgs/commit/121e7d9335187fa742abba7994e03b495b8f2a6c
  Author: John Ericson 
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
R pkgs/build-support/gcc-cross-wrapper/add-flags
R pkgs/build-support/gcc-cross-wrapper/builder.sh
R pkgs/build-support/gcc-cross-wrapper/default.nix
R pkgs/build-support/gcc-cross-wrapper/gcc-wrapper.sh
R pkgs/build-support/gcc-cross-wrapper/ld-wrapper.sh
R pkgs/build-support/gcc-cross-wrapper/setup-hook.sh
R pkgs/build-support/gcc-cross-wrapper/utils.sh
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  gcc-cross-wrapper: Remove in favor of newly-cross-supporting `cc-wrapper`


  Commit: 9bfd03eff78aa37bff9a7f4cb12c6bed1f04e764
  
https://github.com/NixOS/nixpkgs/commit/9bfd03eff78aa37bff9a7f4cb12c6bed1f04e764
  Author: John Ericson 
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
M pkgs/stdenv/adapters.nix
M pkgs/stdenv/cross/default.nix
M pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  cross stdenv a

[Nix-commits] [NixOS/nixpkgs] 8f970d: ghcHEAD: Actually split docs into their own output

2017-06-22 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 8f970d09fe8e895b6bb7dbf52f80411a45504b19
  
https://github.com/NixOS/nixpkgs/commit/8f970d09fe8e895b6bb7dbf52f80411a45504b19
  Author: John Ericson 
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
M pkgs/development/compilers/ghc/head.nix

  Log Message:
  ---
  ghcHEAD: Actually split docs into their own output

I put `outputs = ...` in the wrong spot in the last PR, oops. Sorry
about that.


  Commit: f571ad45955c21ac5b44820231d4c07867ac3564
  
https://github.com/NixOS/nixpkgs/commit/f571ad45955c21ac5b44820231d4c07867ac3564
  Author: John Ericson 
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
M pkgs/development/compilers/ghc/head.nix

  Log Message:
  ---
  Merge pull request #26775 from obsidiansystems/ghc-head-docs

ghcHEAD: Actually split docs into their own output


Compare: https://github.com/NixOS/nixpkgs/compare/aba574c4faee...f571ad45955c___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 0bb2f9: LTS Haskell 8.18

2017-06-16 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 0bb2f9af5e6d654ad0d75adbcaf245ad77f35a18
  
https://github.com/NixOS/nixpkgs/commit/0bb2f9af5e6d654ad0d75adbcaf245ad77f35a18
  Author: Peter Simons 
  Date:   2017-06-16 (Fri, 16 Jun 2017)

  Changed paths:
M pkgs/development/haskell-modules/configuration-hackage2nix.yaml

  Log Message:
  ---
  LTS Haskell 8.18


  Commit: 46f8242d89bce76a0d2b7b0ed276262e1ee9f797
  
https://github.com/NixOS/nixpkgs/commit/46f8242d89bce76a0d2b7b0ed276262e1ee9f797
  Author: Peter Simons 
  Date:   2017-06-16 (Fri, 16 Jun 2017)

  Changed paths:
M pkgs/development/haskell-modules/configuration-hackage2nix.yaml

  Log Message:
  ---
  hackage2nix: disable broken 'trasa-reflex' package

Depends on insecure webkitgtk-2.4.11.


  Commit: 0335b93284b156291d77ff121ea51a01c07527c5
  
https://github.com/NixOS/nixpkgs/commit/0335b93284b156291d77ff121ea51a01c07527c5
  Author: Peter Simons 
  Date:   2017-06-16 (Fri, 16 Jun 2017)

  Changed paths:
M pkgs/development/haskell-modules/hackage-packages.nix

  Log Message:
  ---
  hackage-packages.nix: automatic Haskell package set update

This update was generated by hackage2nix v2.2.1-10-g4e4961f from Hackage 
revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/e2c9a8916e8d005f3c9e6a55f7fc717fdaf4394c.


  Commit: 35762f6ce3eed226f785cf4a54d2f9f0a7f7975d
  
https://github.com/NixOS/nixpkgs/commit/35762f6ce3eed226f785cf4a54d2f9f0a7f7975d
  Author: Peter Simons 
  Date:   2017-06-16 (Fri, 16 Jun 2017)

  Changed paths:
M pkgs/development/haskell-modules/configuration-common.nix

  Log Message:
  ---
  git-annex: update hash for new version


  Commit: 7bcfdc1c1173322ad5f8363e1d987de2d9d597de
  
https://github.com/NixOS/nixpkgs/commit/7bcfdc1c1173322ad5f8363e1d987de2d9d597de
  Author: Peter Simons 
  Date:   2017-06-16 (Fri, 16 Jun 2017)

  Changed paths:
M pkgs/development/haskell-modules/configuration-common.nix
M pkgs/development/haskell-modules/configuration-hackage2nix.yaml

  Log Message:
  ---
  stack: build with hpack version 0.17.x


  Commit: 8a8f0408cd9b7fdda1095718107c800057658c44
  
https://github.com/NixOS/nixpkgs/commit/8a8f0408cd9b7fdda1095718107c800057658c44
  Author: John Ericson 
  Date:   2017-06-16 (Fri, 16 Jun 2017)

  Changed paths:
M pkgs/development/haskell-modules/generic-builder.nix

  Log Message:
  ---
  generic-builder: use buildInputs for Haskell dependencies

This actually will matter when I (soon) land cross-compilation support,
and native deps are compiled for the build, instead of host, platform.
But even now, it's good style do this, and one less thing to review
later.

The use of `$nativePkgs` is unfortunate, as it will need to be
swapped out for `$crossPkgs` for build != host builds. This will just a
temporarily cause pain, however, as eventually I will change stdenv to
use a `$runPkgs` (or moral equivalent) in both case.

Closes https://github.com/NixOS/nixpkgs/pull/26480.


Compare: https://github.com/NixOS/nixpkgs/compare/ac8451508b7d...8a8f0408cd9b___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


Re: [Nix-dev] GCC Cross Compiler Version

2017-06-14 Thread John Ericson
You need to edit gccCrossStageStatic so gcc7, and not gcc is being overridden

On Mon, Jun 12, 2017 at 1:56 PM, Angelo Bulfone  wrote:
> Hello,
>
> I'm trying to make a nix expression to build bare metal cross compilers for
> operating system development, but I would like to use a target that is only
> available with GCC7. I was able to build a cross compiler with
> gccCrossStageStatic, but that's restricted to GCC5.
> The closest I've gotten has been using wrapCCCross with gcc = pkgs.gcc7, but
> then it complains about attribute 'langCC' missing, which appears to be an
> argument to gcc, but is not stored in the set.
> Does anyone know the best way to make a bare metal cross compiler for a
> specific gcc version and target?
>
> Thank you for any assistance.
> Angelo
>
> ___
> nix-dev mailing list
> nix-dev@lists.science.uu.nl
> https://mailman.science.uu.nl/mailman/listinfo/nix-dev
>
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-dev


[Nix-commits] [NixOS/nixpkgs] 7a1345: gcc 7: Remove `cross` arguments and don't use stde...

2017-06-08 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 7a134572532323900a6661e5f1fea09b6dea3479
  
https://github.com/NixOS/nixpkgs/commit/7a134572532323900a6661e5f1fea09b6dea3479
  Author: John Ericson 
  Date:   2017-06-08 (Thu, 08 Jun 2017)

  Changed paths:
M pkgs/development/compilers/gcc/7/default.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  gcc 7: Remove `cross` arguments and don't use stdenv.is*

These changes were already done for the older GCCs, but 7 slipped
through the cracks.


  Commit: 2f348884b8bc8938d2a98f4960a81ab1a2377f7f
  
https://github.com/NixOS/nixpkgs/commit/2f348884b8bc8938d2a98f4960a81ab1a2377f7f
  Author: John Ericson 
  Date:   2017-06-08 (Thu, 08 Jun 2017)

  Changed paths:
M pkgs/development/compilers/gcc/7/default.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  Merge pull request #26471 from obsidiansystems/gcc7-no-cross-arg

gcc 7: Remove `cross` arguments and don't use stdenv.is*


Compare: https://github.com/NixOS/nixpkgs/compare/3cb5d52dacba...2f348884b8bc___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 200ac0: binutils: Modernize derivation

2017-06-06 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 200ac02d0f9947cb997edfb9688818042fd52569
  
https://github.com/NixOS/nixpkgs/commit/200ac02d0f9947cb997edfb9688818042fd52569
  Author: John Ericson 
  Date:   2017-06-06 (Tue, 06 Jun 2017)

  Changed paths:
M pkgs/development/tools/misc/binutils/default.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  binutils: Modernize derivation

No hashes of any sort should be changed


  Commit: e854685d65f4f6bf9afe5b34550c15f69afa9247
  
https://github.com/NixOS/nixpkgs/commit/e854685d65f4f6bf9afe5b34550c15f69afa9247
  Author: Ross MacLeod 
  Date:   2017-06-06 (Tue, 06 Jun 2017)

  Changed paths:
M pkgs/development/compilers/gcc/4.5/default.nix
M pkgs/development/compilers/gcc/4.8/default.nix
M pkgs/development/compilers/gcc/4.9/default.nix
M pkgs/development/compilers/gcc/5/default.nix
M pkgs/development/compilers/gcc/6/default.nix
M pkgs/development/compilers/gcc/snapshot/default.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  gcc*: Remove cross argument and instead use hostPlatform and targetPlatform


  Commit: 35ed21d09636ea85806685c92723a5ebc2d6bb39
  
https://github.com/NixOS/nixpkgs/commit/35ed21d09636ea85806685c92723a5ebc2d6bb39
  Author: John Ericson 
  Date:   2017-06-06 (Tue, 06 Jun 2017)

  Changed paths:
M pkgs/development/compilers/gcc/4.5/default.nix
M pkgs/development/compilers/gcc/4.8/default.nix
M pkgs/development/compilers/gcc/4.9/default.nix
M pkgs/development/compilers/gcc/5/default.nix
M pkgs/development/compilers/gcc/6/default.nix
M pkgs/development/compilers/gcc/snapshot/default.nix

  Log Message:
  ---
  gcc*: Replace stdenv.is* with {host,target}Platform.is*

Host everywhere would be guaranteed to preserve the old semantics,
but in a few places it doesn't matter in practice, target is used
instead for clarity.


  Commit: 6518dffc02bb7548f5a025bc7e42d2a30ec78109
  
https://github.com/NixOS/nixpkgs/commit/6518dffc02bb7548f5a025bc7e42d2a30ec78109
  Author: John Ericson 
  Date:   2017-06-06 (Tue, 06 Jun 2017)

  Changed paths:
M pkgs/development/compilers/gcc/4.5/default.nix
M pkgs/development/compilers/gcc/4.8/default.nix
M pkgs/development/compilers/gcc/4.9/default.nix
M pkgs/development/compilers/gcc/5/default.nix
M pkgs/development/compilers/gcc/6/default.nix
M pkgs/development/compilers/gcc/snapshot/default.nix
M pkgs/development/tools/misc/binutils/default.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  Merge pull request #26388 from obsidiansystems/tools-cleanup-rote

Tools cleanup rote


Compare: https://github.com/NixOS/nixpkgs/compare/d7a5f07650da...6518dffc02bb___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 9f680d: lib and doc: Use "libSystem" as identifier for tha...

2017-05-30 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 9f680d30f4a8bac670932255caa4d39e7fb39f09
  
https://github.com/NixOS/nixpkgs/commit/9f680d30f4a8bac670932255caa4d39e7fb39f09
  Author: John Ericson 
  Date:   2017-05-31 (Wed, 31 May 2017)

  Changed paths:
M doc/cross-compilation.xml
M lib/systems/examples.nix

  Log Message:
  ---
  lib and doc: Use "libSystem" as identifier for that libc in platforms


  Commit: 4e376cce7ecca2aa184c701e3d2cf3a1f3298d82
  
https://github.com/NixOS/nixpkgs/commit/4e376cce7ecca2aa184c701e3d2cf3a1f3298d82
  Author: John Ericson 
  Date:   2017-05-31 (Wed, 31 May 2017)

  Changed paths:
M doc/cross-compilation.xml
M lib/systems/examples.nix

  Log Message:
  ---
  Merge pull request #26269 from obsidiansystems/libSystem

lib and doc: Use "libSystem" as identifier for that libc in platforms


Compare: https://github.com/NixOS/nixpkgs/compare/cfe6bd47ed64...4e376cce7ecc___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 87b4a9: lib: Move fixed-point combinators out of trivial

2017-05-30 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 87b4a91fc4145e04ca028c08754bd144b8d1d02d
  
https://github.com/NixOS/nixpkgs/commit/87b4a91fc4145e04ca028c08754bd144b8d1d02d
  Author: John Ericson 
  Date:   2017-05-29 (Mon, 29 May 2017)

  Changed paths:
M lib/default.nix
A lib/fixed-points.nix
M lib/trivial.nix

  Log Message:
  ---
  lib: Move fixed-point combinators out of trivial

Trivia != prelude. This is a better organized and less likely to
scare off new contributors.


  Commit: 8b273b608d48989fa30a3a2fe56f362b314157b3
  
https://github.com/NixOS/nixpkgs/commit/8b273b608d48989fa30a3a2fe56f362b314157b3
  Author: John Ericson 
  Date:   2017-05-30 (Tue, 30 May 2017)

  Changed paths:
M lib/default.nix
A lib/fixed-points.nix
M lib/trivial.nix

  Log Message:
  ---
  Merge pull request #26219 from Ericson2314/lib-fix

lib: Move fixed-point combinators out of trivial


Compare: https://github.com/NixOS/nixpkgs/compare/de52d2450eeb...8b273b608d48___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 20e756: lib: Consolidate platform configurations (used for...

2017-05-29 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 20e756a0936fb75ce8f9d9ef0b7a511198bf7eea
  
https://github.com/NixOS/nixpkgs/commit/20e756a0936fb75ce8f9d9ef0b7a511198bf7eea
  Author: John Ericson 
  Date:   2017-05-29 (Mon, 29 May 2017)

  Changed paths:
M doc/cross-compilation.xml
M lib/systems/default.nix
A lib/systems/examples.nix
M lib/systems/platforms.nix
M pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
M pkgs/top-level/release-cross.nix

  Log Message:
  ---
  lib: Consolidate platform configurations (used for crossSystem)

This is good for maintenance and education.


  Commit: c66ff8ec3ce37a01659294efc36c4ab5e3036462
  
https://github.com/NixOS/nixpkgs/commit/c66ff8ec3ce37a01659294efc36c4ab5e3036462
  Author: John Ericson 
  Date:   2017-05-29 (Mon, 29 May 2017)

  Changed paths:
M lib/systems/examples.nix

  Log Message:
  ---
  cross tests and stdenv: armv5te*l* of sheevaplug explicit

The "l" suffix presumably indicates it is little-endian, which it
is.


  Commit: a908ad6fd342836cbf8d2670f6bf62dda31f956e
  
https://github.com/NixOS/nixpkgs/commit/a908ad6fd342836cbf8d2670f6bf62dda31f956e
  Author: John Ericson 
  Date:   2017-05-29 (Mon, 29 May 2017)

  Changed paths:
M doc/cross-compilation.xml
M lib/systems/default.nix
A lib/systems/examples.nix
M lib/systems/platforms.nix
M pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
M pkgs/top-level/release-cross.nix

  Log Message:
  ---
  Merge pull request #26037 from obsidiansystems/platform-examples

lib: Consolidate platform configurations (used for crossSystem)


Compare: https://github.com/NixOS/nixpkgs/compare/2b0a8427e699...a908ad6fd342___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 11f513: doc/cross-compilation: cleanup some grammar

2017-05-24 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 11f5136005567dce5d92791b97192cf03edd4855
  
https://github.com/NixOS/nixpkgs/commit/11f5136005567dce5d92791b97192cf03edd4855
  Author: Matthew Bauer 
  Date:   2017-05-23 (Tue, 23 May 2017)

  Changed paths:
M doc/cross-compilation.xml

  Log Message:
  ---
  doc/cross-compilation: cleanup some grammar

These all should be uncontroversial changes. Just some awkward wording and
double words, etc.


  Commit: e9e9af4b5c10cb7712ae3cb9ee3154316feec660
  
https://github.com/NixOS/nixpkgs/commit/e9e9af4b5c10cb7712ae3cb9ee3154316feec660
  Author: Matthew Bauer 
  Date:   2017-05-24 (Wed, 24 May 2017)

  Changed paths:
M doc/cross-compilation.xml

  Log Message:
  ---
  doc/cross-compilation: change cross to target

thanks to @bjornfor for catching this


  Commit: 53b3b1b6986e225ec10d951edff41b5da8da48d0
  
https://github.com/NixOS/nixpkgs/commit/53b3b1b6986e225ec10d951edff41b5da8da48d0
  Author: John Ericson 
  Date:   2017-05-24 (Wed, 24 May 2017)

  Changed paths:
M doc/cross-compilation.xml

  Log Message:
  ---
  Merge pull request #26046 from matthewbauer/manual-cross-fix

doc/cross-compilation: cleanup some grammar


Compare: https://github.com/NixOS/nixpkgs/compare/4f6dde2494ff...53b3b1b6986e___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] df0817: release-cross: Be less absurd in `ensureUnaffected...

2017-05-22 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: df081787ee740874aa594dac797d17583bb63793
  
https://github.com/NixOS/nixpkgs/commit/df081787ee740874aa594dac797d17583bb63793
  Author: John Ericson 
  Date:   2017-05-23 (Tue, 23 May 2017)

  Changed paths:
M pkgs/top-level/release-cross.nix

  Log Message:
  ---
  release-cross: Be less absurd in `ensureUnaffected` tests

We need to at least used a valid 4-part LLVM target "triple" and
libc.


  Commit: b1d2f410c77a84fb097557b25e98a81236b6bd24
  
https://github.com/NixOS/nixpkgs/commit/b1d2f410c77a84fb097557b25e98a81236b6bd24
  Author: John Ericson 
  Date:   2017-05-23 (Tue, 23 May 2017)

  Changed paths:
M pkgs/top-level/release-cross.nix

  Log Message:
  ---
  Merge pull request #26013 from obsidiansystems/release-cross

release-cross: Be less absurd in `ensureUnaffected` tests


Compare: https://github.com/NixOS/nixpkgs/compare/8a423c3a90a4...b1d2f410c77a___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 56b7f9: gdb: s/target/tagetPlatform

2017-05-22 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 56b7f9b94d5b0dc57ce73a1c5bc53259ef1486db
  
https://github.com/NixOS/nixpkgs/commit/56b7f9b94d5b0dc57ce73a1c5bc53259ef1486db
  Author: John Ericson 
  Date:   2017-05-23 (Tue, 23 May 2017)

  Changed paths:
M pkgs/development/tools/misc/gdb/default.nix

  Log Message:
  ---
  gdb: s/target/tagetPlatform

Oops, missed this when cleaning up derivation recently


  Commit: 8a423c3a90a4fdc92e6b44ec46c135d4ab13730e
  
https://github.com/NixOS/nixpkgs/commit/8a423c3a90a4fdc92e6b44ec46c135d4ab13730e
  Author: John Ericson 
  Date:   2017-05-23 (Tue, 23 May 2017)

  Changed paths:
M pkgs/development/tools/misc/gdb/default.nix

  Log Message:
  ---
  Merge pull request #26012 from Ericson2314/gdb-fix

gdb: s/target/tagetPlatform


Compare: https://github.com/NixOS/nixpkgs/compare/51930ce432a7...8a423c3a90a4___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] eaa509: stdenv: Rename `isGNU` to `isHurd` as GNU is a use...

2017-05-22 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: eaa509f33a7058bd819f02a1da32c4ed372e6b49
  
https://github.com/NixOS/nixpkgs/commit/eaa509f33a7058bd819f02a1da32c4ed372e6b49
  Author: John Ericson 
  Date:   2017-05-22 (Mon, 22 May 2017)

  Changed paths:
M lib/systems/inspect.nix
M lib/systems/parse.nix
M pkgs/development/compilers/gcc/4.8/default.nix
M pkgs/development/compilers/gcc/4.9/default.nix
M pkgs/development/compilers/gcc/5/default.nix
M pkgs/development/compilers/gcc/6/default.nix
M pkgs/development/compilers/gcc/snapshot/default.nix
M pkgs/stdenv/generic/default.nix

  Log Message:
  ---
  stdenv: Rename `isGNU` to `isHurd` as GNU is a userland

Elsewhere, things called GNU indeed includes GNU/Linux or GNU/Hurd, but this
predicate was defined excluding Linux regardless of userland.


  Commit: c443033be325f0f39d621d28407ea00af2b45631
  
https://github.com/NixOS/nixpkgs/commit/c443033be325f0f39d621d28407ea00af2b45631
  Author: John Ericson 
  Date:   2017-05-22 (Mon, 22 May 2017)

  Changed paths:
M pkgs/development/tools/misc/gdb/default.nix
M pkgs/top-level/all-packages.nix
M pkgs/top-level/release-cross.nix

  Log Message:
  ---
  gdb: Modernize and simplify derivation

 - `isGNU` to `isHurd`, my sedding did not catch
 - Simplify cross compilation in general
 - Be more careful about python
 - no more `gdbCross` in all-packages


  Commit: fedcda6cdaafc91a03c3aafac087aedf03ae8ae0
  
https://github.com/NixOS/nixpkgs/commit/fedcda6cdaafc91a03c3aafac087aedf03ae8ae0
  Author: John Ericson 
  Date:   2017-05-22 (Mon, 22 May 2017)

  Changed paths:
M lib/systems/inspect.nix
M pkgs/tools/archivers/zpaq/zpaqd.nix

  Log Message:
  ---
  zpaqd: Modernize derivation

 - Simplified platform-specific options
 - Almost ready for cross-compilation


  Commit: c3b2c5bf77f9d437b4656f0244bcdf2ab8d0102c
  
https://github.com/NixOS/nixpkgs/commit/c3b2c5bf77f9d437b4656f0244bcdf2ab8d0102c
  Author: John Ericson 
  Date:   2017-05-22 (Mon, 22 May 2017)

  Changed paths:
M lib/systems/inspect.nix
M lib/systems/parse.nix
M pkgs/development/compilers/gcc/4.8/default.nix
M pkgs/development/compilers/gcc/4.9/default.nix
M pkgs/development/compilers/gcc/5/default.nix
M pkgs/development/compilers/gcc/6/default.nix
M pkgs/development/compilers/gcc/snapshot/default.nix
M pkgs/development/tools/misc/gdb/default.nix
M pkgs/stdenv/generic/default.nix
M pkgs/tools/archivers/zpaq/zpaqd.nix
M pkgs/top-level/all-packages.nix
M pkgs/top-level/release-cross.nix

  Log Message:
  ---
  Merge pull request #25997 from obsidiansystems/isHurd

stdenv: Rename `isGNU` to `isHurd` as GNU is a userland


Compare: https://github.com/NixOS/nixpkgs/compare/02bb7c2ec04b...c3b2c5bf77f9___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] da8b2f: lib tests: Simplify relative path for default argu...

2017-05-22 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: da8b2f1412c77ef50c90587d4b0f3a66e11892d6
  
https://github.com/NixOS/nixpkgs/commit/da8b2f1412c77ef50c90587d4b0f3a66e11892d6
  Author: John Ericson 
  Date:   2017-05-21 (Sun, 21 May 2017)

  Changed paths:
M lib/tests/release.nix

  Log Message:
  ---
  lib tests: Simplify relative path for default argument


  Commit: 2e7ec6fb702be66389405d48693b322565b27c69
  
https://github.com/NixOS/nixpkgs/commit/2e7ec6fb702be66389405d48693b322565b27c69
  Author: John Ericson 
  Date:   2017-05-22 (Mon, 22 May 2017)

  Changed paths:
M lib/systems/default.nix
M lib/systems/doubles.nix
A lib/systems/inspect.nix
M lib/systems/parse.nix
M pkgs/os-specific/darwin/cctools/port.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  lib: Make platform predicates more ergonomic to use

`hostPlatform.isDarwin` instead of `lib.system.parse.isDarwin
hostPlatform.parsed`


  Commit: c5c66060484800ecd97a811157a31e9cdd2241b1
  
https://github.com/NixOS/nixpkgs/commit/c5c66060484800ecd97a811157a31e9cdd2241b1
  Author: John Ericson 
  Date:   2017-05-22 (Mon, 22 May 2017)

  Changed paths:
M lib/systems/default.nix
M pkgs/stdenv/generic/default.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  lib: Infer `libc` field of platform if not specified

This is especially useful when not cross compiling. It means we can
remove the `stdenv.isGlibc` predicate too.

Additionally, use this to simplify the logic to choose the
appropriate libiconv derivation.


  Commit: 1dc6f15de995da2d0351b34c40215336e219cf82
  
https://github.com/NixOS/nixpkgs/commit/1dc6f15de995da2d0351b34c40215336e219cf82
  Author: John Ericson 
  Date:   2017-05-22 (Mon, 22 May 2017)

  Changed paths:
M pkgs/stdenv/darwin/default.nix
M pkgs/stdenv/freebsd/default.nix
M pkgs/stdenv/generic/default.nix
M pkgs/stdenv/linux/default.nix
M pkgs/stdenv/native/default.nix
M pkgs/stdenv/nix/default.nix

  Log Message:
  ---
  stdenv: define is* predicates with hostPlatform.is*

This is a saner default until stdenv's are removed altogether


  Commit: 0d88299019bcd0611ec7356e7e380d9706f09f9d
  
https://github.com/NixOS/nixpkgs/commit/0d88299019bcd0611ec7356e7e380d9706f09f9d
  Author: John Ericson 
  Date:   2017-05-22 (Mon, 22 May 2017)

  Changed paths:
M lib/systems/default.nix
M lib/systems/doubles.nix
A lib/systems/inspect.nix
M lib/systems/parse.nix
M lib/tests/release.nix
M pkgs/os-specific/darwin/cctools/port.nix
M pkgs/stdenv/darwin/default.nix
M pkgs/stdenv/freebsd/default.nix
M pkgs/stdenv/generic/default.nix
M pkgs/stdenv/linux/default.nix
M pkgs/stdenv/native/default.nix
M pkgs/stdenv/nix/default.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  Merge pull request #25976 from obsidiansystems/no-stdenv-is

Add `*Platform.is*` predicates and alias `stdenv.is*` to `hostPlatform`'s


Compare: https://github.com/NixOS/nixpkgs/compare/37c89794...0d88299019bc___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 7e0960: glibc: Fix for cross

2017-05-20 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 7e096024d7cf0ea1ca2a0d0d79d33d3f3e4e9965
  
https://github.com/NixOS/nixpkgs/commit/7e096024d7cf0ea1ca2a0d0d79d33d3f3e4e9965
  Author: John Ericson 
  Date:   2017-05-19 (Fri, 19 May 2017)

  Changed paths:
M pkgs/development/libraries/glibc/common.nix
M pkgs/development/libraries/glibc/default.nix
M pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  glibc: Fix for cross


  Commit: 25edc476fd9fe1bd8bedf571d218ba4f27fb5a27
  
https://github.com/NixOS/nixpkgs/commit/25edc476fd9fe1bd8bedf571d218ba4f27fb5a27
  Author: John Ericson 
  Date:   2017-05-20 (Sat, 20 May 2017)

  Changed paths:
M pkgs/development/libraries/glibc/common.nix
M pkgs/development/libraries/glibc/default.nix
M pkgs/development/libraries/glibc/info.nix
M pkgs/development/libraries/glibc/locales.nix
M pkgs/top-level/release-cross.nix

  Log Message:
  ---
  glibc: Simplify derivation further

No native hashes should be changed with this commit
default.nix's cross hash should also not be changed


  Commit: bb37fc90c751699e5152e7a8d1d26b0b8beea00f
  
https://github.com/NixOS/nixpkgs/commit/bb37fc90c751699e5152e7a8d1d26b0b8beea00f
  Author: John Ericson 
  Date:   2017-05-20 (Sat, 20 May 2017)

  Changed paths:
M pkgs/development/libraries/glibc/common.nix
M pkgs/development/libraries/glibc/default.nix
M pkgs/development/libraries/glibc/info.nix
M pkgs/development/libraries/glibc/locales.nix
M pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
M pkgs/top-level/all-packages.nix
M pkgs/top-level/release-cross.nix

  Log Message:
  ---
  Merge pull request #25897 from obsidiansystems/glibc-cross

glibc: Clean up cross compilation


Compare: https://github.com/NixOS/nixpkgs/compare/4e4f7a2f6684...bb37fc90c751___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] a19cf2: ncurses: Break hash to simplify derivation

2017-05-19 Thread John Ericson
  Branch: refs/heads/staging
  Home:   https://github.com/NixOS/nixpkgs
  Commit: a19cf228d5032ad9722ef1aa82abc4814da5
  
https://github.com/NixOS/nixpkgs/commit/a19cf228d5032ad9722ef1aa82abc4814da5
  Author: John Ericson 
  Date:   2017-05-18 (Thu, 18 May 2017)

  Changed paths:
M pkgs/development/libraries/ncurses/default.nix

  Log Message:
  ---
  ncurses: Break hash to simplify derivation


  Commit: b175feb8e141262b20f56d662d0b40f69df8e5c9
  
https://github.com/NixOS/nixpkgs/commit/b175feb8e141262b20f56d662d0b40f69df8e5c9
  Author: John Ericson 
  Date:   2017-05-19 (Fri, 19 May 2017)

  Changed paths:
M pkgs/development/libraries/ncurses/default.nix

  Log Message:
  ---
  Merge pull request #25875 from obsidiansystems/ncurses-cross

ncurses: Break hash to simplify derivation


Compare: https://github.com/NixOS/nixpkgs/compare/5aa530f2a8f6...b175feb8e141___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] df9129: release-cross: Do a recursive union to make sure w...

2017-05-18 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: df91297181d0d62da0d090039af52a44ff70467d
  
https://github.com/NixOS/nixpkgs/commit/df91297181d0d62da0d090039af52a44ff70467d
  Author: John Ericson 
  Date:   2017-05-18 (Thu, 18 May 2017)

  Changed paths:
M pkgs/top-level/release-cross.nix

  Log Message:
  ---
  release-cross: Do a recursive union to make sure we don't loose tests


  Commit: f6863bcf7a760461dc5c5c06b3252c3088ed466a
  
https://github.com/NixOS/nixpkgs/commit/f6863bcf7a760461dc5c5c06b3252c3088ed466a
  Author: John Ericson 
  Date:   2017-05-18 (Thu, 18 May 2017)

  Changed paths:
M pkgs/top-level/release-cross.nix

  Log Message:
  ---
  Merge pull request #25895 from obsidiansystems/cross-tests

release-cross: Do a recursive union to make sure we don't loose tests


Compare: https://github.com/NixOS/nixpkgs/compare/d4e2cbd5c95a...f6863bcf7a76___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 766670: gmp 6: Fix for cross

2017-05-17 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 76667036ecb84d299424d0cba345b83040e869ae
  
https://github.com/NixOS/nixpkgs/commit/76667036ecb84d299424d0cba345b83040e869ae
  Author: John Ericson 
  Date:   2017-05-17 (Wed, 17 May 2017)

  Changed paths:
M pkgs/development/libraries/gmp/6.x.nix

  Log Message:
  ---
  gmp 6: Fix for cross


  Commit: 8ad2c6a830784bdc37a04f349ec5f13a1b16edee
  
https://github.com/NixOS/nixpkgs/commit/8ad2c6a830784bdc37a04f349ec5f13a1b16edee
  Author: John Ericson 
  Date:   2017-05-17 (Wed, 17 May 2017)

  Changed paths:
M pkgs/development/libraries/ncurses/default.nix

  Log Message:
  ---
  ncurses: Fix for cross


  Commit: 2601a80639ecee27fdb83ce099c037a348ba7125
  
https://github.com/NixOS/nixpkgs/commit/2601a80639ecee27fdb83ce099c037a348ba7125
  Author: John Ericson 
  Date:   2017-05-17 (Wed, 17 May 2017)

  Changed paths:
M pkgs/top-level/release-cross.nix

  Log Message:
  ---
  release-cross: Make tests more uniform

Fewer packages are only built on one platform. Eventually we should
have each package encode its own requirements on build host and target
(as we do for build already) and use that to test automatically.


  Commit: afec912d81e08339868e0e1e84234e6ed7f6b3fd
  
https://github.com/NixOS/nixpkgs/commit/afec912d81e08339868e0e1e84234e6ed7f6b3fd
  Author: John Ericson 
  Date:   2017-05-17 (Wed, 17 May 2017)

  Changed paths:
M pkgs/development/libraries/gmp/6.x.nix
M pkgs/development/libraries/ncurses/default.nix
M pkgs/top-level/release-cross.nix

  Log Message:
  ---
  Merge pull request #25867 from obsidiansystems/ghc-deps-cross

Fix cross compilation of some GHC deps


Compare: https://github.com/NixOS/nixpkgs/compare/64acaa1e2dcb...afec912d81e0___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] bfa8f3: linux cross stdenv: Use the cross stdenv and `nati...

2017-05-17 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: bfa8f3049989739223687324aec986d4da3b5dae
  
https://github.com/NixOS/nixpkgs/commit/bfa8f3049989739223687324aec986d4da3b5dae
  Author: John Ericson 
  Date:   2017-05-17 (Wed, 17 May 2017)

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

  Log Message:
  ---
  linux cross stdenv: Use the cross stdenv and `nativeBuildInputs`

This is a cross derivation---it's built on one platform to run on
another---so let's structure it like all the other cross derivations.


  Commit: 88ea6463a342c2084266395b210d57b1218bad62
  
https://github.com/NixOS/nixpkgs/commit/88ea6463a342c2084266395b210d57b1218bad62
  Author: John Ericson 
  Date:   2017-05-17 (Wed, 17 May 2017)

  Changed paths:
M pkgs/development/tools/misc/binutils/default.nix
M pkgs/os-specific/darwin/binutils/default.nix
M pkgs/os-specific/darwin/cctools/port.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  binutils on darwin: Clean up the rats nest

 - No more *Cross duplication for binutils on darwin either.
   `cctools_cross` is merged into plain `cctools`, so `buildPackages`
   chains alone are used to disambiguate.

 - Always use a mashup of cctools and actual GNU Binutils as `binutils`.
   Previously, this was only done in the native case as nobody had
   bothered to implement the masher in the cross case. Implemented it
   basically consisted of extending the wrapper to deal with prefixed
   binaries.


  Commit: 7018dfb9f4d1457d77495014a2e22febe2b9181a
  
https://github.com/NixOS/nixpkgs/commit/7018dfb9f4d1457d77495014a2e22febe2b9181a
  Author: John Ericson 
  Date:   2017-05-17 (Wed, 17 May 2017)

  Changed paths:
M pkgs/development/tools/misc/binutils/default.nix
M pkgs/os-specific/darwin/binutils/default.nix
M pkgs/os-specific/darwin/cctools/port.nix

  Log Message:
  ---
  binutils and cctools: Prefix derivation names with target for cross

We want platform triple prefixes and suffixes on derivation names to
be used consistently. The ideom this commit strives for is

 - suffix means build != host, i.e. cross *built* packages. This is
   already done.

 - prefix means build != target, i.e. cross tools. This matches the
   tradition of such binaries themselves being prefixed to disambiguate.]
   Binutils and cctools, as build tools, now use the latter


  Commit: 20fa6fd87146a55ca5b66b88bf3d30012acbdac0
  
https://github.com/NixOS/nixpkgs/commit/20fa6fd87146a55ca5b66b88bf3d30012acbdac0
  Author: John Ericson 
  Date:   2017-05-17 (Wed, 17 May 2017)

  Changed paths:
M pkgs/development/compilers/gcc/4.5/default.nix
M pkgs/development/compilers/gcc/4.8/default.nix
M pkgs/development/compilers/gcc/4.9/default.nix
M pkgs/development/compilers/gcc/5/default.nix
M pkgs/development/compilers/gcc/6/default.nix
M pkgs/development/compilers/gcc/snapshot/default.nix

  Log Message:
  ---
  gcc: When cross compiling, always expect prefixed binutils

Previously this was just done on Darwin.


  Commit: d34079c2d9d22e3d13778e7a948b16247610ec7c
  
https://github.com/NixOS/nixpkgs/commit/d34079c2d9d22e3d13778e7a948b16247610ec7c
  Author: John Ericson 
  Date:   2017-05-17 (Wed, 17 May 2017)

  Changed paths:
M pkgs/top-level/release-cross.nix

  Log Message:
  ---
  release-cross: Add arms test from Darwin for binutils

This does a decent job of testing everything in this PR up to here.


  Commit: 80ed251f176aefa4c31a93ebb550df009d9bb49e
  
https://github.com/NixOS/nixpkgs/commit/80ed251f176aefa4c31a93ebb550df009d9bb49e
  Author: John Ericson 
  Date:   2017-05-17 (Wed, 17 May 2017)

  Changed paths:
M lib/systems/parse.nix

  Log Message:
  ---
  lib platform parsing: Whitelist `darwin10` and `darwin14` as stopgap

Something better should be done longer term to support such version
suffixes.


  Commit: bec5ffee155fd8dc9481d8eea45d788baee9bd46
  
https://github.com/NixOS/nixpkgs/commit/bec5ffee155fd8dc9481d8eea45d788baee9bd46
  Author: John Ericson 
  Date:   2017-05-17 (Wed, 17 May 2017)

  Changed paths:
M lib/systems/parse.nix
M pkgs/development/compilers/gcc/4.5/default.nix
M pkgs/development/compilers/gcc/4.8/default.nix
M pkgs/development/compilers/gcc/4.9/default.nix
M pkgs/development/compilers/gcc/5/default.nix
M pkgs/development/compilers/gcc/6/default.nix
M pkgs/development/compilers/gcc/snapshot/default.nix
M pkgs/development/tools/misc/binutils/default.nix
M pkgs/os-specific/darwin/binutils/default.nix
M pkgs/os-specific/darwin/cctools/port.nix
M pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
M pkgs/top-level/all-packages.nix
M pkgs/top-level/release-cross.nix

  Log Message:
  ---
  Merge pull request #25232 from obsidiansystems/cross-binutils

Cross binutils


Compare: https://github.com/NixOS/nixpkgs/compare/20

[Nix-commits] [NixOS/nixpkgs] f0e190: linuxHeadersCross: Remove and just use `linuxHeade...

2017-05-17 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: f0e1907beed52608e1ff65eb6b30cbbcd7170132
  
https://github.com/NixOS/nixpkgs/commit/f0e1907beed52608e1ff65eb6b30cbbcd7170132
  Author: John Ericson 
  Date:   2017-05-17 (Wed, 17 May 2017)

  Changed paths:
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  linuxHeadersCross: Remove and just use `linuxHeaders`


  Commit: f2e2463367818f287bcb948e9eb7dec416cc57af
  
https://github.com/NixOS/nixpkgs/commit/f2e2463367818f287bcb948e9eb7dec416cc57af
  Author: John Ericson 
  Date:   2017-05-17 (Wed, 17 May 2017)

  Changed paths:
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  Merge pull request #25866 from obsidiansystems/linux-headers-cross

linuxHeadersCross: Remove and just use `linuxHeaders`


Compare: https://github.com/NixOS/nixpkgs/compare/b8e80d9389d9...f2e246336781___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 587079: linux cross stdenv: Fix eval errors

2017-05-17 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 5870795cc68b29681ca644a8802fa11b469f2095
  
https://github.com/NixOS/nixpkgs/commit/5870795cc68b29681ca644a8802fa11b469f2095
  Author: John Ericson 
  Date:   2017-05-17 (Wed, 17 May 2017)

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

  Log Message:
  ---
  linux cross stdenv: Fix eval errors

`pkgsNoParams` was removed by me, but then #25035 was merged using it,
leading to an unbound identifier.

It would be nice to get travis to do build release-cross.nix or
something to catch these things.


  Commit: 3e0b6b51416951a5327f313ec5d0e17d1a91a150
  
https://github.com/NixOS/nixpkgs/commit/3e0b6b51416951a5327f313ec5d0e17d1a91a150
  Author: John Ericson 
  Date:   2017-05-17 (Wed, 17 May 2017)

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

  Log Message:
  ---
  Merge pull request #25862 from obsidiansystems/linux-stdenv-cross

linux cross stdenv: Fix eval errors


Compare: https://github.com/NixOS/nixpkgs/compare/6d599b791ec5...3e0b6b514169___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 371ebc: lib platform parsing: Fix windows support to confo...

2017-05-17 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 371ebc89ca8cfb48f9624981aab72563afb892b9
  
https://github.com/NixOS/nixpkgs/commit/371ebc89ca8cfb48f9624981aab72563afb892b9
  Author: John Ericson 
  Date:   2017-05-17 (Wed, 17 May 2017)

  Changed paths:
M lib/systems/doubles.nix
M lib/systems/parse.nix
M pkgs/top-level/all-packages.nix
M pkgs/top-level/release-cross.nix

  Log Message:
  ---
  lib platform parsing: Fix windows support to conform to LLVM, take 2

Second attempt at pull request #25275

This reverts commit b70924bd80918d153a5e2023afd7647ae7b24a12,
reapplying 2282a5774cd80567644a44d31585bf965a55f9ec


  Commit: 6d599b791ec5d04504b90743447c23d3d23e10fc
  
https://github.com/NixOS/nixpkgs/commit/6d599b791ec5d04504b90743447c23d3d23e10fc
  Author: John Ericson 
  Date:   2017-05-17 (Wed, 17 May 2017)

  Changed paths:
M lib/systems/doubles.nix
M lib/systems/parse.nix
M pkgs/top-level/all-packages.nix
M pkgs/top-level/release-cross.nix

  Log Message:
  ---
  Merge pull request #25859 from Ericson2314/platform-normalize

lib platform parsing: Fix windows support to conform to LLVM, take 2


Compare: https://github.com/NixOS/nixpkgs/compare/f3c989babdca...6d599b791ec5___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 296753: lib: Consolidate tests into one meta job

2017-05-17 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 296753f0947427d5753be68ae10363ac1b8b4cdc
  
https://github.com/NixOS/nixpkgs/commit/296753f0947427d5753be68ae10363ac1b8b4cdc
  Author: John Ericson 
  Date:   2017-05-17 (Wed, 17 May 2017)

  Changed paths:
R lib/tests.nix
A lib/tests/misc.nix
M lib/tests/release.nix
M lib/tests/systems.nix
M pkgs/top-level/make-tarball.nix
M pkgs/top-level/release.nix

  Log Message:
  ---
  lib: Consolidate tests into one meta job


  Commit: f3c989babdcadb296b8e98b8b7572d229a3838fb
  
https://github.com/NixOS/nixpkgs/commit/f3c989babdcadb296b8e98b8b7572d229a3838fb
  Author: John Ericson 
  Date:   2017-05-17 (Wed, 17 May 2017)

  Changed paths:
R lib/tests.nix
A lib/tests/misc.nix
M lib/tests/release.nix
M lib/tests/systems.nix
M pkgs/top-level/make-tarball.nix
M pkgs/top-level/release.nix

  Log Message:
  ---
  Merge pull request #25196 from Ericson2314/recursive-platform-tests

lib: Consolidate tests into one meta job


Compare: https://github.com/NixOS/nixpkgs/compare/6ba53a7c8129...f3c989babdca___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 5c7815: impure.nix: add crossSystem as arg

2017-04-29 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 5c7815a3887508b8ba5fd35393a856aa20406a24
  
https://github.com/NixOS/nixpkgs/commit/5c7815a3887508b8ba5fd35393a856aa20406a24
  Author: Matthew Bauer 
  Date:   2017-04-29 (Sat, 29 Apr 2017)

  Changed paths:
M pkgs/top-level/impure.nix

  Log Message:
  ---
  impure.nix: add crossSystem as arg


  Commit: f71456ac2409a9352abcf9260aed0323e225f82e
  
https://github.com/NixOS/nixpkgs/commit/f71456ac2409a9352abcf9260aed0323e225f82e
  Author: John Ericson 
  Date:   2017-04-29 (Sat, 29 Apr 2017)

  Changed paths:
M pkgs/top-level/impure.nix

  Log Message:
  ---
  Merge pull request #25301 from matthewbauer/impure-cross

impure.nix: add crossSystem as arg


Compare: https://github.com/NixOS/nixpkgs/compare/48ec680ddb04...f71456ac2409___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 7d546d: lib platform parsing: Turn assertion back on

2017-04-27 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 7d546d777109a448bb3bd80b67923326586fef31
  
https://github.com/NixOS/nixpkgs/commit/7d546d777109a448bb3bd80b67923326586fef31
  Author: John Ericson 
  Date:   2017-04-27 (Thu, 27 Apr 2017)

  Changed paths:
M lib/systems/parse.nix

  Log Message:
  ---
  lib platform parsing: Turn assertion back on


  Commit: fcde869e7e0514817ea3dc8cd21c45f2c9e3bb86
  
https://github.com/NixOS/nixpkgs/commit/fcde869e7e0514817ea3dc8cd21c45f2c9e3bb86
  Author: John Ericson 
  Date:   2017-04-27 (Thu, 27 Apr 2017)

  Changed paths:
M lib/systems/doubles.nix
M lib/systems/parse.nix
M pkgs/top-level/all-packages.nix
M pkgs/top-level/release-cross.nix

  Log Message:
  ---
  lib platform parsing: Fix windows

There is no more `cygwin` OS, but instead a `cygnus` abi. "win32"
and "mingw32" parse as `windows`. Add a 3-part hack because autotools
breaks on explicit abi with windows-like (e.g. "i686-pc-windows-gnu").

Also change cross triples to conform


  Commit: 92887cb46636d91eb5cfc1afbc3536b5c757f6ab
  
https://github.com/NixOS/nixpkgs/commit/92887cb46636d91eb5cfc1afbc3536b5c757f6ab
  Author: John Ericson 
  Date:   2017-04-27 (Thu, 27 Apr 2017)

  Changed paths:
M pkgs/top-level/release-cross.nix

  Log Message:
  ---
  release-cross: Add final "-gnu" to fuloong triple


  Commit: ab298085d4e13f0ba9009616775bf5a8ac7a13bc
  
https://github.com/NixOS/nixpkgs/commit/ab298085d4e13f0ba9009616775bf5a8ac7a13bc
  Author: John Ericson 
  Date:   2017-04-27 (Thu, 27 Apr 2017)

  Changed paths:
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  cross mingw: Enable C++ on i686

Actually the old check wasn't being hit because a slightly different
target triple was being used.


  Commit: 2282a5774cd80567644a44d31585bf965a55f9ec
  
https://github.com/NixOS/nixpkgs/commit/2282a5774cd80567644a44d31585bf965a55f9ec
  Author: John Ericson 
  Date:   2017-04-27 (Thu, 27 Apr 2017)

  Changed paths:
M lib/systems/doubles.nix
M lib/systems/parse.nix
M pkgs/top-level/all-packages.nix
M pkgs/top-level/release-cross.nix

  Log Message:
  ---
  Merge pull request #25275 from Ericson2314/platform-normalize

lib platform parsing: Fix windows support to conform to LLVM


Compare: https://github.com/NixOS/nixpkgs/compare/14adea915660...2282a5774cd8___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 23cc0c: lib: Whitelist two ABIs used on Arm

2017-04-26 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 23cc0c4420d3b2d5fb023f2368ba7d11412c1fba
  
https://github.com/NixOS/nixpkgs/commit/23cc0c4420d3b2d5fb023f2368ba7d11412c1fba
  Author: John Ericson 
  Date:   2017-04-25 (Tue, 25 Apr 2017)

  Changed paths:
M lib/systems/parse.nix

  Log Message:
  ---
  lib: Whitelist two ABIs used on Arm


  Commit: 85b4d30c0b464f6431eac6c50687111cfc69eb22
  
https://github.com/NixOS/nixpkgs/commit/85b4d30c0b464f6431eac6c50687111cfc69eb22
  Author: John Ericson 
  Date:   2017-04-25 (Tue, 25 Apr 2017)

  Changed paths:
M pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  binutils: Respect the targetPlatform

Use `buildPackages.binutils` to get build = host != target binutils,
i.e. the old `binutilsCross`, and use
`buildPackages.buildPackages.binutils` to get build = host = target
binutils, i.e. the old `binutils`.

`buildPackages` chains like this are supposed to remove the need for
all such `*Cross` derivations. We start with binutils because it's
comparatively easy.

No hashes of cross-tests should be changed


  Commit: 295315cc87acd13caa39ea87c1d8d010e7a587df
  
https://github.com/NixOS/nixpkgs/commit/295315cc87acd13caa39ea87c1d8d010e7a587df
  Author: John Ericson 
  Date:   2017-04-25 (Tue, 25 Apr 2017)

  Changed paths:
M pkgs/development/compilers/gcc/4.5/default.nix
M pkgs/development/compilers/gcc/4.8/default.nix
M pkgs/development/compilers/gcc/4.9/default.nix
M pkgs/development/compilers/gcc/5/default.nix
M pkgs/development/compilers/gcc/6/default.nix
M pkgs/development/compilers/gcc/snapshot/default.nix
M pkgs/development/compilers/ghc/head.nix
M pkgs/os-specific/windows/mingw-w64/default.nix
M pkgs/os-specific/windows/mingwrt/default.nix
M pkgs/os-specific/windows/w32api/default.nix
M pkgs/stdenv/adapters.nix
M pkgs/stdenv/cross/default.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  binutilsCross: Remove and use `binutils` instead always

See previous commit for what was done to `binutils` to make this
possible.

There were some uses of `forcedNativePackages` added. The
combination of overrides with that attribute is highly spooky: it's
often important that if an overridden package comes from it, the
replaced arguments for that package come from it. Long term this
package set and all the spookiness should be gone and irrelevant:

  "Move along, nothing to see here!"

No hashes should be changed with this commit


  Commit: 761af147780c7dc68cbbfa93213cc73dd25f75ba
  
https://github.com/NixOS/nixpkgs/commit/761af147780c7dc68cbbfa93213cc73dd25f75ba
  Author: John Ericson 
  Date:   2017-04-26 (Wed, 26 Apr 2017)

  Changed paths:
M lib/systems/parse.nix
M pkgs/development/compilers/gcc/4.5/default.nix
M pkgs/development/compilers/gcc/4.8/default.nix
M pkgs/development/compilers/gcc/4.9/default.nix
M pkgs/development/compilers/gcc/5/default.nix
M pkgs/development/compilers/gcc/6/default.nix
M pkgs/development/compilers/gcc/snapshot/default.nix
M pkgs/development/compilers/ghc/head.nix
M pkgs/os-specific/windows/mingw-w64/default.nix
M pkgs/os-specific/windows/mingwrt/default.nix
M pkgs/os-specific/windows/w32api/default.nix
M pkgs/stdenv/adapters.nix
M pkgs/stdenv/cross/default.nix
M pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  Merge pull request #25227 from obsidiansystems/cross-purge-binutilsCross

Purge binutilsCross


Compare: https://github.com/NixOS/nixpkgs/compare/aea925758162...761af147780c___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 78bb5f: linux cross stdenv: Pull platforms from lib to cut...

2017-04-25 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 78bb5f5f3775e220e5d4bbe30851dd7fec072bf8
  
https://github.com/NixOS/nixpkgs/commit/78bb5f5f3775e220e5d4bbe30851dd7fec072bf8
  Author: John Ericson 
  Date:   2017-04-25 (Tue, 25 Apr 2017)

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

  Log Message:
  ---
  linux cross stdenv: Pull platforms from lib to cut eval time


  Commit: 6cb0f0bcd9758a1c68f2acd564f329476c2365ea
  
https://github.com/NixOS/nixpkgs/commit/6cb0f0bcd9758a1c68f2acd564f329476c2365ea
  Author: John Ericson 
  Date:   2017-04-25 (Tue, 25 Apr 2017)

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

  Log Message:
  ---
  Merge pull request #25225 from Ericson2314/linux-cross-stdenv-eval

linux cross stdenv: Pull platforms from lib to cut eval time


Compare: https://github.com/NixOS/nixpkgs/compare/5dd731b801ac...6cb0f0bcd975___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] a7d891: top-level: `stdenv.cross` is now only defined with...

2017-04-24 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: a7d89139ea74791137bfa606d109e515512c8460
  
https://github.com/NixOS/nixpkgs/commit/a7d89139ea74791137bfa606d109e515512c8460
  Author: John Ericson 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
M pkgs/top-level/stage.nix

  Log Message:
  ---
  top-level: `stdenv.cross` is now only defined with host != build

In practice, this is a strictly stronger condition than target != build
as we never have build = target != host. Really, the attribute should
be removed altogether, but for now we make it work for plain libraries,
which do not care about the target platform. In the few cases where the
compilers use this and actually care about the target platform, I'll
manually change them to use `targetPlatform` instead.


  Commit: a7068ace35c5344fc2760733d32cca8fd4f01116
  
https://github.com/NixOS/nixpkgs/commit/a7068ace35c5344fc2760733d32cca8fd4f01116
  Author: John Ericson 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
M pkgs/development/compilers/gcc/4.5/default.nix
M pkgs/development/compilers/gcc/4.8/default.nix
M pkgs/development/compilers/gcc/4.9/default.nix
M pkgs/development/compilers/gcc/5/default.nix
M pkgs/development/compilers/gcc/6/default.nix
M pkgs/development/compilers/gcc/snapshot/default.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  Rewrite a few `stdenv.cross` uses that *should* be `targetPlatform`

The previous commit redefines `stdenv.cross` for the sake of normal
libaries, the most common use-case of that attribute. Some compilers
however relied on the old definition so we have them use
`targetPlatform` instead. This special casing is fine because we
eventually want to remove `stdenv.cross` and use either `hostPlatform`
or `targetPlatform` instead.


  Commit: 49c99b70cf64ccf99cd292426b3dbcaeb2e885aa
  
https://github.com/NixOS/nixpkgs/commit/49c99b70cf64ccf99cd292426b3dbcaeb2e885aa
  Author: John Ericson 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
M pkgs/stdenv/adapters.nix
M pkgs/stdenv/cross/default.nix
M pkgs/stdenv/darwin/default.nix
M pkgs/stdenv/linux/default.nix

  Log Message:
  ---
  cross-stdenv: Only prune most overrides in the final stage

Before all overrides were also pruned in the previous stage, now
only gcc and binutils are, because they alone care about about the
target platform. The rest of the overrides don't, so it's better to
preserve them in order to avoid spurious rebuilds.


  Commit: 75441dd64ac0a7f87ad9ee44574d829263792fef
  
https://github.com/NixOS/nixpkgs/commit/75441dd64ac0a7f87ad9ee44574d829263792fef
  Author: John Ericson 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
M pkgs/development/compilers/gcc/4.5/default.nix
M pkgs/development/compilers/gcc/4.8/default.nix
M pkgs/development/compilers/gcc/4.9/default.nix
M pkgs/development/compilers/gcc/5/default.nix
M pkgs/development/compilers/gcc/6/default.nix
M pkgs/development/compilers/gcc/snapshot/default.nix
M pkgs/stdenv/adapters.nix
M pkgs/stdenv/cross/default.nix
M pkgs/stdenv/darwin/default.nix
M pkgs/stdenv/linux/default.nix
M pkgs/top-level/all-packages.nix
M pkgs/top-level/stage.nix

  Log Message:
  ---
  Merge pull request #25194 from obsidiansystems/host-target-unconfuse

stdenv.cross is a silly attribute that needs to go leaving the well-defined 
hostPlatform and targetPlatform. This PR doesn't remove it, but changes its 
definition: before it tracked the target platform which is sometimes more 
useful for compilers, and now it tracks the host platform which is more useful 
for everything else. Most usages are libraries, falling in the "everything 
else" category, so changing the definition makes sense to appease the majority. 
The few compiler (gcc in particular) uses that exist I remove to use 
targetPlatform --- preserving correctness and becoming more explicit in the 
process.

I would also update the documentation aside mentioning stdenv.cross as 
deprecated, but the definition given actually erroneously assumes this PR is 
already merged!


Compare: https://github.com/NixOS/nixpkgs/compare/f2d1aa05de4d...75441dd64ac0___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] db5a92: crossStdenv on iphone: Just get info from `targetP...

2017-04-24 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: db5a921945b9b2051077a6b7b708e3b1785cc3ea
  
https://github.com/NixOS/nixpkgs/commit/db5a921945b9b2051077a6b7b708e3b1785cc3ea
  Author: John Ericson 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
M pkgs/os-specific/darwin/ios-cross/default.nix
M pkgs/stdenv/cross/default.nix

  Log Message:
  ---
  crossStdenv on iphone: Just get info from `targetPlatform`


  Commit: af6e4c5b0d92301f24cdb96aae2267ceec26f6ff
  
https://github.com/NixOS/nixpkgs/commit/af6e4c5b0d92301f24cdb96aae2267ceec26f6ff
  Author: John Ericson 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
M pkgs/os-specific/darwin/ios-cross/default.nix
M pkgs/stdenv/cross/default.nix

  Log Message:
  ---
  Merge pull request #25190 from obsidiansystems/ios-stdenv-tiny-refactor

crossStdenv on iphone: Just get info from `targetPlatform`


Compare: https://github.com/NixOS/nixpkgs/compare/84b1c0c481d4...af6e4c5b0d92___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] bef527: top-level: Common subexpression elimination for cc...

2017-04-24 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: bef52786646f997fb4c2997f23e33b4e720fcef3
  
https://github.com/NixOS/nixpkgs/commit/bef52786646f997fb4c2997f23e33b4e720fcef3
  Author: John Ericson 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  top-level: Common subexpression elimination for cc-wrapper usage

 - `ccWrapperFun` can be used in a few more places instead of
   duplicating its definition.

 - `ccWrapper` parameter on `wrapCC` is always substituted with
   `ccWrapperFun` so just get rid of that parameter.


  Commit: ee2d787cc354f986a8e352e897ea4832729c88d6
  
https://github.com/NixOS/nixpkgs/commit/ee2d787cc354f986a8e352e897ea4832729c88d6
  Author: John Ericson 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  Merge pull request #25186 from obsidiansystems/ccwrapper-cse

top-level: common subexpression elimination for cc-wrapper usage


Compare: https://github.com/NixOS/nixpkgs/compare/027734526554...ee2d787cc354___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] af8f87: top-level: Do not splice `pkgs`, `buildPackages` o...

2017-04-23 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: af8f87a3a124c7db1506119b379d673d1982e4c9
  
https://github.com/NixOS/nixpkgs/commit/af8f87a3a124c7db1506119b379d673d1982e4c9
  Author: John Ericson 
  Date:   2017-04-23 (Sun, 23 Apr 2017)

  Changed paths:
M pkgs/top-level/splice.nix

  Log Message:
  ---
  top-level: Do not splice `pkgs`, `buildPackages` or `*Platform`

 - `pkgs` is self-similar, and thus already spliced
 - `buildPackages` is an ingredient of splicing and should be kept as is
 - The platforms are not packages or package sets and couldn't be spliced

There's probably other things that shouldn't be spliced too. The best long-
term solution is simply to stop splicing altogether.


  Commit: d59e4fbb75e307fd1a0e98c44627f38bab504aeb
  
https://github.com/NixOS/nixpkgs/commit/d59e4fbb75e307fd1a0e98c44627f38bab504aeb
  Author: John Ericson 
  Date:   2017-04-23 (Sun, 23 Apr 2017)

  Changed paths:
M pkgs/top-level/stage.nix

  Log Message:
  ---
  stage.nix: Better explain why `buildPackages` as `null` is valid arg


  Commit: 863d79b36446bb2dbcc34d4f57c832ac2dc57f68
  
https://github.com/NixOS/nixpkgs/commit/863d79b36446bb2dbcc34d4f57c832ac2dc57f68
  Author: John Ericson 
  Date:   2017-04-23 (Sun, 23 Apr 2017)

  Changed paths:
M doc/cross-compilation.xml
M pkgs/stdenv/booter.nix
M pkgs/top-level/splice.nix
M pkgs/top-level/stage.nix

  Log Message:
  ---
  top-level: Introduce targetPackages and a "double link fold"

Each bootstrapping stage ought to just depend on the previous stage, but
poorly-written compilers break this elegence. This provides an easy-enough
way to depend on the next stage: targetPackages. PLEASE DO NOT USE IT
UNLESS YOU MUST!

I'm hoping someday in a pleasant future I can revert this commit :)


  Commit: b59fdc4289f52d4e59e938f66d7181f6a28f98a1
  
https://github.com/NixOS/nixpkgs/commit/b59fdc4289f52d4e59e938f66d7181f6a28f98a1
  Author: John Ericson 
  Date:   2017-04-23 (Sun, 23 Apr 2017)

  Changed paths:
M doc/cross-compilation.xml
M pkgs/stdenv/booter.nix
M pkgs/top-level/splice.nix
M pkgs/top-level/stage.nix

  Log Message:
  ---
  Merge pull request #25099 from obsidiansystems/cross-lib-foundation

Changes to nixpkgs infra to prepare to better package some pesky cross-compilers

No hashes (native or cross) should be changed


Compare: https://github.com/NixOS/nixpkgs/compare/749d495cb3a8...b59fdc4289f5___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] d8e87f: Disable parallel building

2017-04-19 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: d8e87fc0c4357d9683f7b9fa4bea8faa34bb7693
  
https://github.com/NixOS/nixpkgs/commit/d8e87fc0c4357d9683f7b9fa4bea8faa34bb7693
  Author: David Johnson 
  Date:   2017-04-19 (Wed, 19 Apr 2017)

  Changed paths:
M pkgs/development/compilers/halvm/2.4.0.nix

  Log Message:
  ---
  Disable parallel building


  Commit: 124c4b10c4d0df6ad061ee4951db49faae772241
  
https://github.com/NixOS/nixpkgs/commit/124c4b10c4d0df6ad061ee4951db49faae772241
  Author: John Ericson 
  Date:   2017-04-19 (Wed, 19 Apr 2017)

  Changed paths:
M pkgs/development/compilers/halvm/2.4.0.nix

  Log Message:
  ---
  Merge pull request #25032 from dmjio/patch-1

Disable parallel building


Compare: https://github.com/NixOS/nixpkgs/compare/ff252c799db1...124c4b10c4d0___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] c13457: doc: Document the structure of `{build, host, target...

2017-04-18 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: c13457fe58c354ac2437b4380f27fca4b771c034
  
https://github.com/NixOS/nixpkgs/commit/c13457fe58c354ac2437b4380f27fca4b771c034
  Author: John Ericson 
  Date:   2017-04-18 (Tue, 18 Apr 2017)

  Changed paths:
M doc/cross-compilation.xml

  Log Message:
  ---
  doc: Document the structure of `{build,host,target}Platforms`

Worthwhile to do now that #24610 makes it less abysmal.


  Commit: 1eabc2396145cfed08d9937ce6d1cc2501b9bd8e
  
https://github.com/NixOS/nixpkgs/commit/1eabc2396145cfed08d9937ce6d1cc2501b9bd8e
  Author: John Ericson 
  Date:   2017-04-18 (Tue, 18 Apr 2017)

  Changed paths:
M doc/cross-compilation.xml

  Log Message:
  ---
  Merge pull request #24980 from Ericson2314/platform-normalization

Doc for Platform Normalization


Compare: https://github.com/NixOS/nixpkgs/compare/0c8cf2809155...1eabc2396145___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 5c91dc: release-cross: Fix more typos---this is embarrisin...

2017-04-17 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 5c91dc9bcf654fc7f476cf3d56bd257b4fd13668
  
https://github.com/NixOS/nixpkgs/commit/5c91dc9bcf654fc7f476cf3d56bd257b4fd13668
  Author: John Ericson 
  Date:   2017-04-17 (Mon, 17 Apr 2017)

  Changed paths:
M pkgs/top-level/release-cross.nix

  Log Message:
  ---
  release-cross: Fix more typos---this is embarrising


  Commit: 9239bc6c9680950abf49ace083f64590aff97bed
  
https://github.com/NixOS/nixpkgs/commit/9239bc6c9680950abf49ace083f64590aff97bed
  Author: John Ericson 
  Date:   2017-04-17 (Mon, 17 Apr 2017)

  Changed paths:
M pkgs/top-level/release-cross.nix

  Log Message:
  ---
  Merge pull request #24982 from Ericson2314/fix

release-cross: Fix more typos---this is embarrising


Compare: https://github.com/NixOS/nixpkgs/compare/1832a34a9a6a...9239bc6c9680___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 9169f3: release-cross: Fix typo preventing evaluation

2017-04-17 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 9169f3c92471702b48a9553f7438a1b3018339de
  
https://github.com/NixOS/nixpkgs/commit/9169f3c92471702b48a9553f7438a1b3018339de
  Author: John Ericson 
  Date:   2017-04-17 (Mon, 17 Apr 2017)

  Changed paths:
M pkgs/top-level/release-cross.nix

  Log Message:
  ---
  release-cross: Fix typo preventing evaluation


  Commit: 1832a34a9a6a6f6c9bdac1993805d591c9b0d9d8
  
https://github.com/NixOS/nixpkgs/commit/1832a34a9a6a6f6c9bdac1993805d591c9b0d9d8
  Author: John Ericson 
  Date:   2017-04-17 (Mon, 17 Apr 2017)

  Changed paths:
M pkgs/top-level/release-cross.nix

  Log Message:
  ---
  Merge pull request #24981 from Ericson2314/fix

release-cross: Fix typo preventing evaluation


Compare: https://github.com/NixOS/nixpkgs/compare/6b7c5ba5353e...1832a34a9a6a___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 213d29: release-cross: For fuloong, just use the predefine...

2017-04-17 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 213d29f6b7c44cdc5182dacad78de047063845fa
  
https://github.com/NixOS/nixpkgs/commit/213d29f6b7c44cdc5182dacad78de047063845fa
  Author: John Ericson 
  Date:   2017-04-17 (Mon, 17 Apr 2017)

  Changed paths:
M pkgs/top-level/release-cross.nix

  Log Message:
  ---
  release-cross: For fuloong, just use the predefined platform

This is a semantic change, but probably a safe one. In any event, this is
very old hardware that probably no one uses anymore anyways.


  Commit: b477851f3427e3353d530ab0d47b63fe2686dd4b
  
https://github.com/NixOS/nixpkgs/commit/b477851f3427e3353d530ab0d47b63fe2686dd4b
  Author: John Ericson 
  Date:   2017-04-17 (Mon, 17 Apr 2017)

  Changed paths:
M pkgs/top-level/release-cross.nix
M pkgs/top-level/release-lib.nix
M pkgs/top-level/release-python.nix
M pkgs/top-level/release-small.nix
M pkgs/top-level/release.nix

  Log Message:
  ---
  top-level: Less indirection for lib in release*.nix


  Commit: 22277893923cdf26004d83b608b7e1c3ca7030fb
  
https://github.com/NixOS/nixpkgs/commit/22277893923cdf26004d83b608b7e1c3ca7030fb
  Author: John Ericson 
  Date:   2017-04-17 (Mon, 17 Apr 2017)

  Changed paths:
M lib/default.nix
R lib/platforms.nix
R lib/systems.nix
A lib/systems/default.nix
A lib/systems/doubles.nix
A lib/systems/parse.nix
A lib/systems/platforms.nix
M pkgs/top-level/all-packages.nix
M pkgs/top-level/default.nix
R pkgs/top-level/platforms.nix
M pkgs/top-level/release-cross.nix

  Log Message:
  ---
  lib: Collect system/platform related files

Previously, platforms was a random thing in top-level


  Commit: fffcee35f9b2042d4edc5dccb3379972e03ffd84
  
https://github.com/NixOS/nixpkgs/commit/fffcee35f9b2042d4edc5dccb3379972e03ffd84
  Author: John Ericson 
  Date:   2017-04-17 (Mon, 17 Apr 2017)

  Changed paths:
M lib/attrsets.nix

  Log Message:
  ---
  lib: Fix `matchAttrs`


  Commit: 8c99aab3ea4a9ddbd3918282da7861e674b4e7c4
  
https://github.com/NixOS/nixpkgs/commit/8c99aab3ea4a9ddbd3918282da7861e674b4e7c4
  Author: John Ericson 
  Date:   2017-04-17 (Mon, 17 Apr 2017)

  Changed paths:
M lib/systems/doubles.nix
M lib/systems/parse.nix
M lib/tests/release.nix
A lib/tests/systems.nix
M pkgs/top-level/release-cross.nix
M pkgs/top-level/release-lib.nix
M pkgs/top-level/release.nix

  Log Message:
  ---
  lib: Fix system parsing, and use for doubles lists

The old hard-coded lists are now used to test system parsing.

In the process, make an `assertTrue` in release lib for eval tests; also
use it in release-cross


  Commit: d86caa3216dce17f54c1505a751cf5b403fd8bcf
  
https://github.com/NixOS/nixpkgs/commit/d86caa3216dce17f54c1505a751cf5b403fd8bcf
  Author: John Ericson 
  Date:   2017-04-17 (Mon, 17 Apr 2017)

  Changed paths:
M lib/tests/systems.nix

  Log Message:
  ---
  lib: Fix preexisting bugs in old platforms code (now bugs in tests)

Warning, this changes the compatibility claims of existing packages!


  Commit: 3efc661a1de6a2ce9b98aa39283e68914297b8d7
  
https://github.com/NixOS/nixpkgs/commit/3efc661a1de6a2ce9b98aa39283e68914297b8d7
  Author: John Ericson 
  Date:   2017-04-17 (Mon, 17 Apr 2017)

  Changed paths:
M lib/systems/default.nix
M lib/systems/platforms.nix
M pkgs/top-level/default.nix

  Log Message:
  ---
  Elaborate `localSystem` and `crossSystem` in a consistent manner


  Commit: f0b634c7e838cdd65ac6f73933c99af3f38d0fa8
  
https://github.com/NixOS/nixpkgs/commit/f0b634c7e838cdd65ac6f73933c99af3f38d0fa8
  Author: John Ericson 
  Date:   2017-04-17 (Mon, 17 Apr 2017)

  Changed paths:
M lib/attrsets.nix
M lib/default.nix
R lib/platforms.nix
R lib/systems.nix
A lib/systems/default.nix
A lib/systems/doubles.nix
A lib/systems/parse.nix
A lib/systems/platforms.nix
M lib/tests/release.nix
A lib/tests/systems.nix
M pkgs/top-level/all-packages.nix
M pkgs/top-level/default.nix
R pkgs/top-level/platforms.nix
M pkgs/top-level/release-cross.nix
M pkgs/top-level/release-lib.nix
M pkgs/top-level/release-python.nix
M pkgs/top-level/release-small.nix
M pkgs/top-level/release.nix

  Log Message:
  ---
  Merge pull request #24610 from Ericson2314/platform-normalization

Platform normalization


Compare: https://github.com/NixOS/nixpkgs/compare/37e5e71fdf09...f0b634c7e838___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 85aa50: Introduce `mapNullable` into lib and use it in a f...

2017-04-17 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 85aa5005af530fef199cc41148e374e54d70e01e
  
https://github.com/NixOS/nixpkgs/commit/85aa5005af530fef199cc41148e374e54d70e01e
  Author: John Ericson 
  Date:   2017-04-17 (Mon, 17 Apr 2017)

  Changed paths:
M lib/trivial.nix
M nixos/modules/services/monitoring/graphite.nix
M nixos/modules/services/monitoring/prometheus/default.nix
M pkgs/development/libraries/wiredtiger/default.nix
M pkgs/os-specific/linux/nvidia-x11/generic.nix
M pkgs/servers/shishi/default.nix
M pkgs/tools/filesystems/ceph/generic.nix

  Log Message:
  ---
  Introduce `mapNullable` into lib and use it in a few places

Also simply some configure flag logic my grep also alerted me too.


  Commit: 37e5e71fdf098a45471537e9961672592ef6f72a
  
https://github.com/NixOS/nixpkgs/commit/37e5e71fdf098a45471537e9961672592ef6f72a
  Author: John Ericson 
  Date:   2017-04-17 (Mon, 17 Apr 2017)

  Changed paths:
M lib/trivial.nix
M nixos/modules/services/monitoring/graphite.nix
M nixos/modules/services/monitoring/prometheus/default.nix
M pkgs/development/libraries/wiredtiger/default.nix
M pkgs/os-specific/linux/nvidia-x11/generic.nix
M pkgs/servers/shishi/default.nix
M pkgs/tools/filesystems/ceph/generic.nix

  Log Message:
  ---
  Merge pull request #24974 from Ericson2314/mapNullable

Introduce `mapNullable` into lib and use it in a few places


Compare: https://github.com/NixOS/nixpkgs/compare/383706f36db1...37e5e71fdf09___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 6b73c0: netcat-openbsd: pkgconfig is a nativeBuildInput

2017-04-14 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 6b73c0f198c59dd1e67aac39076c3076517c9d38
  
https://github.com/NixOS/nixpkgs/commit/6b73c0f198c59dd1e67aac39076c3076517c9d38
  Author: Eric Litak 
  Date:   2017-04-14 (Fri, 14 Apr 2017)

  Changed paths:
M pkgs/tools/networking/netcat-openbsd/default.nix

  Log Message:
  ---
  netcat-openbsd: pkgconfig is a nativeBuildInput


  Commit: bd45ec6416d9560b050cf098c4eccc1051df0900
  
https://github.com/NixOS/nixpkgs/commit/bd45ec6416d9560b050cf098c4eccc1051df0900
  Author: Eric Litak 
  Date:   2017-04-14 (Fri, 14 Apr 2017)

  Changed paths:
M pkgs/build-support/buildenv/default.nix

  Log Message:
  ---
  buildEnv: use buildPackages.perl so crossDrv works


  Commit: 980ced505fd4da90ae75d1582da6825ef51476c1
  
https://github.com/NixOS/nixpkgs/commit/980ced505fd4da90ae75d1582da6825ef51476c1
  Author: Eric Litak 
  Date:   2017-04-14 (Fri, 14 Apr 2017)

  Changed paths:
M pkgs/tools/misc/coreutils/default.nix

  Log Message:
  ---
  coreutils: fixing ccCross.libc lookup


  Commit: f89504d06746f50d1b7915ad6b31fc58a3449541
  
https://github.com/NixOS/nixpkgs/commit/f89504d06746f50d1b7915ad6b31fc58a3449541
  Author: Eric Litak 
  Date:   2017-04-14 (Fri, 14 Apr 2017)

  Changed paths:
M pkgs/os-specific/linux/kmod/default.nix

  Log Message:
  ---
  kmod: crossDrv should use native xz


  Commit: 3bff114d95da3c9f1d5a438c61cdc8b422676af3
  
https://github.com/NixOS/nixpkgs/commit/3bff114d95da3c9f1d5a438c61cdc8b422676af3
  Author: John Ericson 
  Date:   2017-04-15 (Sat, 15 Apr 2017)

  Changed paths:
M pkgs/build-support/buildenv/default.nix
M pkgs/os-specific/linux/kmod/default.nix
M pkgs/tools/misc/coreutils/default.nix
M pkgs/tools/networking/netcat-openbsd/default.nix

  Log Message:
  ---
  Merge pull request #24871 from elitak/cross-staging

Various small crossDrv fixes


Compare: https://github.com/NixOS/nixpkgs/compare/cdbcaa56b6dd...3bff114d95da___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 6f6968: Add hardening, bump hash to HaLVM

2017-04-14 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 6f69681dad1c937614dbbb767f95480ea630d781
  
https://github.com/NixOS/nixpkgs/commit/6f69681dad1c937614dbbb767f95480ea630d781
  Author: David Johnson 
  Date:   2017-04-14 (Fri, 14 Apr 2017)

  Changed paths:
M pkgs/development/compilers/halvm/2.4.0.nix
M pkgs/development/haskell-modules/generic-builder.nix

  Log Message:
  ---
  Add hardening, bump hash to HaLVM


  Commit: eec35cb6bd82cb0eba69c55e83990f3b9f0107dc
  
https://github.com/NixOS/nixpkgs/commit/eec35cb6bd82cb0eba69c55e83990f3b9f0107dc
  Author: John Ericson 
  Date:   2017-04-14 (Fri, 14 Apr 2017)

  Changed paths:
M pkgs/development/compilers/halvm/2.4.0.nix
M pkgs/development/haskell-modules/generic-builder.nix

  Log Message:
  ---
  Merge pull request #24889 from formaltech/halvm-bump

Remove hardening at HaLVM 2.4.0


Compare: https://github.com/NixOS/nixpkgs/compare/9a10e5ae462b...eec35cb6bd82___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] f3055a: top-level/platforms.nix: Reformat and clean up whi...

2017-04-10 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: f3055a3c508b6ff3e926ece201887467dc2b5d73
  
https://github.com/NixOS/nixpkgs/commit/f3055a3c508b6ff3e926ece201887467dc2b5d73
  Author: John Ericson 
  Date:   2017-04-10 (Mon, 10 Apr 2017)

  Changed paths:
M pkgs/top-level/platforms.nix

  Log Message:
  ---
  top-level/platforms.nix: Reformat and clean up whitespace


  Commit: 2b85b38b1f1a3b7e497a09468988d2d9a2d60751
  
https://github.com/NixOS/nixpkgs/commit/2b85b38b1f1a3b7e497a09468988d2d9a2d60751
  Author: John Ericson 
  Date:   2017-04-10 (Mon, 10 Apr 2017)

  Changed paths:
M pkgs/top-level/platforms.nix

  Log Message:
  ---
  Merge pull request #24804 from Ericson2314/platform-whitespace

top-level/platforms.nix: Reformat and clean up whitespace


Compare: https://github.com/NixOS/nixpkgs/compare/c7dd8a707be6...2b85b38b1f1a___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 4c0d7d: Get rid of all `with { inherit... }` and just used...

2017-03-30 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 4c0d7da1837356047aabfed4661daf4307821b75
  
https://github.com/NixOS/nixpkgs/commit/4c0d7da1837356047aabfed4661daf4307821b75
  Author: John Ericson 
  Date:   2017-03-30 (Thu, 30 Mar 2017)

  Changed paths:
M lib/attrsets.nix
M lib/types.nix
M pkgs/applications/editors/codeblocks/default.nix
M pkgs/applications/networking/p2p/transmission/default.nix
M pkgs/applications/office/libreoffice/default.nix
M pkgs/applications/office/libreoffice/still.nix
M pkgs/development/libraries/cairo/default.nix
M pkgs/development/libraries/freetype/default.nix
M pkgs/development/libraries/gmp/5.1.x.nix
M pkgs/development/libraries/gmp/6.x.nix
M pkgs/development/libraries/libav/default.nix
M pkgs/development/libraries/libgsf/default.nix
M pkgs/development/libraries/nghttp2/default.nix
M pkgs/development/mobile/androidenv/androidsdk.nix
M pkgs/development/tools/misc/binutils/default.nix
M pkgs/games/oilrush/default.nix
M pkgs/servers/coturn/default.nix
M pkgs/servers/dns/knot-dns/default.nix
M pkgs/tools/misc/hdf5/default.nix

  Log Message:
  ---
  Get rid of all `with { inherit... }` and just used `let inherit...`

The old forms presumably predates, or were made in ignorance of,
`let inherit`. This way is better style as the scoping as more lexical,
something which Nix can (or might already!) take advantage of.


  Commit: 166fc028a43e3894b9e0c9d5d7b42eaf359cb598
  
https://github.com/NixOS/nixpkgs/commit/166fc028a43e3894b9e0c9d5d7b42eaf359cb598
  Author: John Ericson 
  Date:   2017-03-30 (Thu, 30 Mar 2017)

  Changed paths:
M lib/attrsets.nix
M lib/types.nix
M pkgs/applications/editors/codeblocks/default.nix
M pkgs/applications/networking/p2p/transmission/default.nix
M pkgs/applications/office/libreoffice/default.nix
M pkgs/applications/office/libreoffice/still.nix
M pkgs/development/libraries/cairo/default.nix
M pkgs/development/libraries/freetype/default.nix
M pkgs/development/libraries/gmp/5.1.x.nix
M pkgs/development/libraries/gmp/6.x.nix
M pkgs/development/libraries/libav/default.nix
M pkgs/development/libraries/libgsf/default.nix
M pkgs/development/libraries/nghttp2/default.nix
M pkgs/development/mobile/androidenv/androidsdk.nix
M pkgs/development/tools/misc/binutils/default.nix
M pkgs/games/oilrush/default.nix
M pkgs/servers/coturn/default.nix
M pkgs/servers/dns/knot-dns/default.nix
M pkgs/tools/misc/hdf5/default.nix

  Log Message:
  ---
  Merge pull request #24465 from Ericson2314/no-with-literal

Get rid of all `with { inherit... }` and just used `let inherit...`


Compare: https://github.com/NixOS/nixpkgs/compare/2a3cd13d732c...166fc028a43e___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] d680f5: top-level: Hack around Nix's --arg logic not handl...

2017-02-09 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: d680f541bf7a1e369cd9faade3ed5618b5917087
  
https://github.com/NixOS/nixpkgs/commit/d680f541bf7a1e369cd9faade3ed5618b5917087
  Author: John Ericson 
  Date:   2017-02-09 (Thu, 09 Feb 2017)

  Changed paths:
M pkgs/top-level/impure.nix

  Log Message:
  ---
  top-level: Hack around Nix's --arg logic not handling unnamed params


  Commit: 18da9bc809879de465aef97f2707aff4337e53b8
  
https://github.com/NixOS/nixpkgs/commit/18da9bc809879de465aef97f2707aff4337e53b8
  Author: John Ericson 
  Date:   2017-02-09 (Thu, 09 Feb 2017)

  Changed paths:
M pkgs/top-level/impure.nix

  Log Message:
  ---
  Merge pull request #22592 from Ericson2314/localSystem-fix

top-level: Hack around Nix's --arg logic not handling unnamed params


Compare: https://github.com/NixOS/nixpkgs/compare/b1e254ac558e...18da9bc80987___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 8cd4c3: top-level: Allow nixpkgs to take localSystem direc...

2017-02-08 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 8cd4c31d6b8c6432986edf0ec5d00d2fe1c12854
  
https://github.com/NixOS/nixpkgs/commit/8cd4c31d6b8c6432986edf0ec5d00d2fe1c12854
  Author: John Ericson 
  Date:   2017-02-08 (Wed, 08 Feb 2017)

  Changed paths:
M doc/cross-compilation.xml
M pkgs/top-level/all-packages.nix
M pkgs/top-level/default.nix
M pkgs/top-level/impure.nix

  Log Message:
  ---
  top-level: Allow nixpkgs to take localSystem directly

This is instead of both system and platform, which is kind of ugly.


  Commit: e74ec9d84f56d33a62fdbc160cd9f3fefdbb580b
  
https://github.com/NixOS/nixpkgs/commit/e74ec9d84f56d33a62fdbc160cd9f3fefdbb580b
  Author: John Ericson 
  Date:   2017-02-08 (Wed, 08 Feb 2017)

  Changed paths:
M doc/cross-compilation.xml
M pkgs/top-level/all-packages.nix
M pkgs/top-level/default.nix
M pkgs/top-level/impure.nix

  Log Message:
  ---
  Merge pull request #22575 from Ericson2314/localSystem

top-level: Allow nixpkgs to take localSystem directly


Compare: https://github.com/NixOS/nixpkgs/compare/77e920d874e9...e74ec9d84f56___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 5eaea6: cross stdenv: let build package's build deps resol...

2017-02-05 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 5eaea6cee01e9172ae65ccb6356861786a0f85cc
  
https://github.com/NixOS/nixpkgs/commit/5eaea6cee01e9172ae65ccb6356861786a0f85cc
  Author: John Ericson 
  Date:   2017-02-05 (Sun, 05 Feb 2017)

  Changed paths:
M doc/cross-compilation.xml
M pkgs/stdenv/cross/default.nix

  Log Message:
  ---
  cross stdenv: let build package's build deps resolve to native packages

This fixes the "sliding window" principle:
  0. Run packages:   build = native;  host = foreign; target = foreign;
  1. Build packages: build = native;  host = native;  target = foreign;
  2. Vanilla packages:   build = native;  host = native;  target = native;
  3. Vanilla packages:   build = native;  host = native;  target = native;
  n+3. ...

Each stage's build dependencies are resolved against the previous stage,
and the "foreigns" are shifted accordingly. Vanilla packages alone are
built against themsevles, since there are no more "foreign"s to shift away.

Before, build packages' build dependencies were resolved against
themselves:
  0. Run packages:   build = native;  host = foreign; target = foreign;
  1. Build packages: build = native;  host = native;  target = foreign;
  2. Build packages: build = native;  host = native;  target = foreign;
  n+2. ...

This is wrong because that principle is violated by the target
platform staying foreign.

This will change the hashes of many build packages and run packages, but
that is OK. This is an unavoidable cost of fixing cross compiling.

The cross compilation docs have been updated to reflect this fix.


  Commit: f6ef6b56fe6c659c51b0b4b866e393aa285389b8
  
https://github.com/NixOS/nixpkgs/commit/f6ef6b56fe6c659c51b0b4b866e393aa285389b8
  Author: John Ericson 
  Date:   2017-02-05 (Sun, 05 Feb 2017)

  Changed paths:
M doc/cross-compilation.xml
M pkgs/stdenv/cross/default.nix

  Log Message:
  ---
  Merge pull request #22387 from Ericson2314/cross-3-platforms

cross stdenv: let build package's build deps resolve to native packages


Compare: https://github.com/NixOS/nixpkgs/compare/2c21f742b26e...f6ef6b56fe6c___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] c869fe: top-level: no more need to expose `splicedPackages...

2017-01-25 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: c869fe022e9db78f779f687e4ac4d7ce5578f447
  
https://github.com/NixOS/nixpkgs/commit/c869fe022e9db78f779f687e4ac4d7ce5578f447
  Author: John Ericson 
  Date:   2017-01-25 (Wed, 25 Jan 2017)

  Changed paths:
M pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
M pkgs/top-level/release-cross.nix
M pkgs/top-level/release-lib.nix
M pkgs/top-level/splice.nix

  Log Message:
  ---
  top-level: no more need to expose `splicedPackages`

This was just done temporarily on the last cross-overhauling PR for
testing purposes.


  Commit: f47757aaf03dd43cc953bdcb30feb015e94bf22a
  
https://github.com/NixOS/nixpkgs/commit/f47757aaf03dd43cc953bdcb30feb015e94bf22a
  Author: John Ericson 
  Date:   2017-01-25 (Wed, 25 Jan 2017)

  Changed paths:
M pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
M pkgs/top-level/release-cross.nix
M pkgs/top-level/release-lib.nix
M pkgs/top-level/splice.nix

  Log Message:
  ---
  Merge pull request #22133 from Ericson2314/no-splice

top-level: no more need to expose `splicedPackages`


Compare: https://github.com/NixOS/nixpkgs/compare/5d5fb4a2fb1f...f47757aaf03d___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] bf17d6: top-level: Introduce `buildPackages` for resolving...

2017-01-24 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: bf17d6dacf2408436ffb5a2f8c87a31c88ec28e2
  
https://github.com/NixOS/nixpkgs/commit/bf17d6dacf2408436ffb5a2f8c87a31c88ec28e2
  Author: John Ericson 
  Date:   2017-01-24 (Tue, 24 Jan 2017)

  Changed paths:
M pkgs/os-specific/gnu/default.nix
M pkgs/stdenv/adapters.nix
M pkgs/stdenv/booter.nix
M pkgs/stdenv/cross/default.nix
M pkgs/stdenv/generic/default.nix
M pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
M pkgs/top-level/all-packages.nix
M pkgs/top-level/release-cross.nix
M pkgs/top-level/release-lib.nix
A pkgs/top-level/splice.nix
M pkgs/top-level/stage.nix

  Log Message:
  ---
  top-level: Introduce `buildPackages` for resolving  build-time deps

[N.B., this package also applies to the commits that follow it in the same
PR.]

In most cases, buildPackages = pkgs so things work just as before. For
cross compiling, however, buildPackages is resolved as the previous
bootstrapping stage. This allows us to avoid the mkDerivation hacks cross
compiling currently uses today.

To avoid a massive refactor, callPackage will splice together both package
sets. Again to avoid churn, it uses the old `nativeDrv` vs `crossDrv` to do
so. So now, whether cross compiling or not, packages with get a `nativeDrv`
and `crossDrv`---in the non-cross-compiling case they are simply the same
derivation. This is good because it reduces the divergence between the
cross and non-cross dataflow. See `pkgs/top-level/splice.nix` for a comment
along the lines of the preceding paragraph, and the code that does this
splicing.

Also, `forceNativeDrv` is replaced with `forceNativePackages`. The latter
resolves `pkgs` unless the host platform is different from the build
platform, in which case it resolves to `buildPackages`. Note that the
target platform is not important here---it will not prevent
`forcedNativePackages` from resolving to `pkgs`.



Temporarily, we make preserve some dubious decisions in the name of preserving
hashes:

Most importantly, we don't distinguish between "host" and "target" in the
autoconf sense. This leads to the proliferation of *Cross derivations
currently used. What we ought to is resolve native deps of the cross "build
packages" (build = host != target) package set against the "vanilla
packages" (build = host = target) package set. Instead, "build packages"
uses itself, with (informally) target != build in all cases.

This is wrong because it violates the "sliding window" principle of
bootstrapping stages that shifting the platform triple of one stage to the
left coincides with the next stage's platform triple. Only because we don't
explicitly distinguish between "host" and "target" does it appear that the
"sliding window" principle is preserved--indeed it is over the reductionary
"platform double" of just "build" and "host/target".

Additionally, we build libc, libgcc, etc in the same stage as the compilers
themselves, which is wrong because they are used at runtime, not build
time. Fixing this is somewhat subtle, and the solution and problem will be
better explained in the commit that does fix it.

Commits after this will solve both these issues, at the expense of breaking
cross hashes. Native hashes won't be broken, thankfully.



Did the temporary ugliness pan out? Of the packages that currently build in
`release-cross.nix`, the only ones that have their hash changed are
`*.gcc.crossDrv` and `bootstrapTools.*.coreutilsMinimal`. In both cases I
think it doesn't matter.

 1. GCC when doing a `build = host = target = foreign` build (maximally
cross), still defines environment variables like `CPATH`[1] with
packages.  This seems assuredly wrong because whether gcc dynamically
links those, or the programs built by gcc dynamically link those---I
have no idea which case is reality---they should be foreign. Therefore,
in all likelihood, I just made the gcc less broken.

 2. Coreutils (ab)used the old cross-compiling infrastructure to depend on
a native version of itself. When coreutils was overwritten to be built
with fewer features, the native version it used would also be
overwritten because the binding was tight. Now it uses the much looser
`BuildPackages.coreutils` which is just fine as a richer build dep
doesn't cause any problems and avoids a rebuild.

So, in conclusion I'd say the conservatism payed off. Onward to actually
raking the muck in the next PR!

[1]: https://gcc.gnu.org/onlinedocs/gcc/Environment-Variables.html


  Commit: eee7cafaf7961b762cb74edd1670b42e5a7547a9
  
https://github.com/NixOS/nixpkgs/commit/eee7cafaf7961b762cb74edd1670b42e5a7547a9
  Author: John Ericson 
  Date:   2017-01-24 (Tue, 24 Jan 2017)

  Changed paths:

[Nix-commits] [NixOS/nixpkgs] a62ee8: release-cross: Expose sub-jobs of linux cross stde...

2017-01-15 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: a62ee8d45cd6d62ac5a985a386a4280a7c4059a6
  
https://github.com/NixOS/nixpkgs/commit/a62ee8d45cd6d62ac5a985a386a4280a7c4059a6
  Author: John Ericson 
  Date:   2017-01-15 (Sun, 15 Jan 2017)

  Changed paths:
M pkgs/top-level/release-cross.nix

  Log Message:
  ---
  release-cross: Expose sub-jobs of linux cross stdenv


  Commit: cef5131ea79029904bd9ae103f358f4ef6ad998c
  
https://github.com/NixOS/nixpkgs/commit/cef5131ea79029904bd9ae103f358f4ef6ad998c
  Author: John Ericson 
  Date:   2017-01-15 (Sun, 15 Jan 2017)

  Changed paths:
M pkgs/top-level/release-cross.nix

  Log Message:
  ---
  Merge pull request #21911 from Ericson2314/release-cross

release-cross: Expose sub-jobs of linux cross stdenv


Compare: https://github.com/NixOS/nixpkgs/compare/f9a9ea920a3b...cef5131ea790___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] fa0a12: release-cross: Use `nativeDrv` rather than relying...

2017-01-14 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: fa0a12e35dc947c34a12fa663e446792d824ba44
  
https://github.com/NixOS/nixpkgs/commit/fa0a12e35dc947c34a12fa663e446792d824ba44
  Author: John Ericson 
  Date:   2017-01-14 (Sat, 14 Jan 2017)

  Changed paths:
M pkgs/top-level/release-cross.nix

  Log Message:
  ---
  release-cross: Use `nativeDrv` rather than relying on default

The default will soon change


  Commit: 27b47ef7360f6dee2fec603f22854bff023a2d57
  
https://github.com/NixOS/nixpkgs/commit/27b47ef7360f6dee2fec603f22854bff023a2d57
  Author: John Ericson 
  Date:   2017-01-14 (Sat, 14 Jan 2017)

  Changed paths:
M pkgs/tools/text/gawk/default.nix

  Log Message:
  ---
  gawk: xz.bin should be a native build input


  Commit: 94ad99e759712d3d41d074dbb8edbbb91e284142
  
https://github.com/NixOS/nixpkgs/commit/94ad99e759712d3d41d074dbb8edbbb91e284142
  Author: John Ericson 
  Date:   2017-01-14 (Sat, 14 Jan 2017)

  Changed paths:
M pkgs/tools/text/gawk/default.nix
M pkgs/top-level/release-cross.nix

  Log Message:
  ---
  Merge pull request #21896 from Ericson2314/gawk

Two changes in preperation of cross cleanup


Compare: https://github.com/NixOS/nixpkgs/compare/c391904b8590...94ad99e75971___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 427dbc: top-level: Add more options to release-cross.nix, ...

2017-01-14 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 427dbcb1d71873573b28d0963149d751345faf3b
  
https://github.com/NixOS/nixpkgs/commit/427dbcb1d71873573b28d0963149d751345faf3b
  Author: John Ericson 
  Date:   2017-01-14 (Sat, 14 Jan 2017)

  Changed paths:
M pkgs/top-level/release-cross.nix
M pkgs/top-level/release.nix

  Log Message:
  ---
  top-level: Add more options to release-cross.nix, normalize param comments


  Commit: b859ae25dd0d457f3320f76cd7ef1f33e772e2a3
  
https://github.com/NixOS/nixpkgs/commit/b859ae25dd0d457f3320f76cd7ef1f33e772e2a3
  Author: John Ericson 
  Date:   2017-01-14 (Sat, 14 Jan 2017)

  Changed paths:
M pkgs/top-level/release-cross.nix
M pkgs/top-level/release.nix

  Log Message:
  ---
  Merge pull request #21891 from Ericson2314/release-cross

top-level: Add more options to release-cross.nix, normalize param com…


Compare: https://github.com/NixOS/nixpkgs/compare/3405f703f221...b859ae25dd0d___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] b51859: gzip: `xz.bin` should be native input---accidental...

2017-01-14 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: b518598a402a294d0ffdd84a92d324440265777d
  
https://github.com/NixOS/nixpkgs/commit/b518598a402a294d0ffdd84a92d324440265777d
  Author: John Ericson 
  Date:   2017-01-14 (Sat, 14 Jan 2017)

  Changed paths:
M pkgs/tools/compression/gzip/default.nix

  Log Message:
  ---
  gzip: `xz.bin` should be native input---accidentally worked because `bin` 
(#21887)

Otherwise http://hydra.nixos.org/build/46501984/nixlog/2


___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 0ef8b6: top-level: Modernize stdenv.overrides giving it se...

2017-01-13 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 0ef8b69d12d1ab1574568f5660b44feba1f44179
  
https://github.com/NixOS/nixpkgs/commit/0ef8b69d12d1ab1574568f5660b44feba1f44179
  Author: John Ericson 
  Date:   2017-01-13 (Fri, 13 Jan 2017)

  Changed paths:
M nixos/doc/manual/release-notes/rl-1703.xml
M pkgs/stdenv/darwin/default.nix
M pkgs/stdenv/generic/default.nix
M pkgs/stdenv/linux/default.nix
M pkgs/stdenv/native/default.nix
M pkgs/stdenv/nix/default.nix
M pkgs/top-level/stage.nix

  Log Message:
  ---
  top-level: Modernize stdenv.overrides giving it self and super

Document breaking change in 17.03 release notes


  Commit: 3e197f7d81130defacfe5bdad71ca5ebe63324ff
  
https://github.com/NixOS/nixpkgs/commit/3e197f7d81130defacfe5bdad71ca5ebe63324ff
  Author: John Ericson 
  Date:   2017-01-13 (Fri, 13 Jan 2017)

  Changed paths:
A pkgs/stdenv/booter.nix
M pkgs/stdenv/cross/default.nix
M pkgs/stdenv/custom/default.nix
M pkgs/stdenv/darwin/default.nix
M pkgs/stdenv/darwin/make-bootstrap-tools.nix
M pkgs/stdenv/default.nix
M pkgs/stdenv/freebsd/default.nix
M pkgs/stdenv/linux/default.nix
M pkgs/stdenv/native/default.nix
M pkgs/stdenv/nix/default.nix
M pkgs/top-level/default.nix
M pkgs/top-level/stage.nix

  Log Message:
  ---
  top-level: Normalize stdenv booting

Introduce new abstraction, `stdenv/booter.nix` for composing bootstraping
stages, and use it everywhere for consistency. See that file for more doc.

Stdenvs besides Linux and Darwin are completely refactored to utilize this.
Those two, due to their size and complexity, are minimally edited for
easier reviewing.

No hashes should be changed.


  Commit: 0f33b9f7f11e414ff6213359ec2859199a68d550
  
https://github.com/NixOS/nixpkgs/commit/0f33b9f7f11e414ff6213359ec2859199a68d550
  Author: David Grayson 
  Date:   2017-01-13 (Fri, 13 Jan 2017)

  Changed paths:
M pkgs/stdenv/cross/default.nix
M pkgs/top-level/stage.nix

  Log Message:
  ---
  top-level: Do stdenvOverrides in stage.nix even if crossSystem exists.

Instead, the cross stdenv will patch up the override field -- the complexity
is now confined to the one place it matters.


  Commit: 67ebd3161b82caf8a1ed30e0cd21dc7bb0177c35
  
https://github.com/NixOS/nixpkgs/commit/67ebd3161b82caf8a1ed30e0cd21dc7bb0177c35
  Author: John Ericson 
  Date:   2017-01-13 (Fri, 13 Jan 2017)

  Changed paths:
M pkgs/top-level/all-packages.nix
M pkgs/top-level/stage.nix

  Log Message:
  ---
  top-level: Inherit `system` and `platform` in stage.nix not all-packages.nix

These are not packages, and so its more elegant to do this outside of
all-packages.nix.


  Commit: 6a45e911c408bfd256531ba4d81bf8151f2f4df8
  
https://github.com/NixOS/nixpkgs/commit/6a45e911c408bfd256531ba4d81bf8151f2f4df8
  Author: John Ericson 
  Date:   2017-01-13 (Fri, 13 Jan 2017)

  Changed paths:
M pkgs/stdenv/linux/default.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  linux stdenv: Utilize overrides and prevStage better

`gcc-unwrapped` basically replaces `gccPlain`. It may seem like an ugly
polution to stick it in all-packages, but a future PR will enshrine this
`*-unwrapped` pattern. In any event, the long term goal is stdenvs might
need to tweak how compilers are booted and wrapped, but the code to build
the unwrapped compilers themselves should be generic.


  Commit: b10f415c2172b3b89b7f93aa62c466fcef911d61
  
https://github.com/NixOS/nixpkgs/commit/b10f415c2172b3b89b7f93aa62c466fcef911d61
  Author: John Ericson 
  Date:   2017-01-13 (Fri, 13 Jan 2017)

  Changed paths:
M pkgs/stdenv/linux/default.nix

  Log Message:
  ---
  linux stdenv: Remove stray use of stage0 to bootstrap more elegantly


  Commit: ff355604602edb2d71e7fecaec4b3871ffc943e3
  
https://github.com/NixOS/nixpkgs/commit/ff355604602edb2d71e7fecaec4b3871ffc943e3
  Author: John Ericson 
  Date:   2017-01-13 (Fri, 13 Jan 2017)

  Changed paths:
M pkgs/stdenv/default.nix
M pkgs/stdenv/linux/default.nix

  Log Message:
  ---
  linux stdenv: Inline stage funs to conform to new convention

Code is just moved around


  Commit: abaf790ea915f826dff694afe032f081c0f5a510
  
https://github.com/NixOS/nixpkgs/commit/abaf790ea915f826dff694afe032f081c0f5a510
  Author: John Ericson 
  Date:   2017-01-13 (Fri, 13 Jan 2017)

  Changed paths:
M pkgs/stdenv/booter.nix

  Log Message:
  ---
  stdenv/booter.nix: Add longer note explaining indexing


  Commit: 0b8e3898705fb90096926469f60d06c3b3762cf7
  
https://github.com/NixOS/nixpkgs/commit/0b8e3898705fb90096926469f60d06c3b3762cf7
  Author: John Ericson 
  Date:   2017-01-13 (Fri, 13 Jan 2017)

  Changed paths:
M nixos/doc/manual/release-notes/rl-1703.xml
A pkgs/stdenv/booter.nix
M pkgs/stdenv/cross/default.nix
M pkgs/stdenv/custom/default.nix
M pkgs/stdenv

[Nix-commits] [NixOS/nixpkgs] 74753d: release-cross: Reformat to be far more legible

2016-12-29 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 74753d01f8249ab1119314fa3d8ac60ccf6e601e
  
https://github.com/NixOS/nixpkgs/commit/74753d01f8249ab1119314fa3d8ac60ccf6e601e
  Author: John Ericson 
  Date:   2016-12-27 (Tue, 27 Dec 2016)

  Changed paths:
M pkgs/top-level/release-cross.nix

  Log Message:
  ---
  release-cross: Reformat to be far more legible


  Commit: db0dbd0b81cdcb879186645a3eec47a9882f2366
  
https://github.com/NixOS/nixpkgs/commit/db0dbd0b81cdcb879186645a3eec47a9882f2366
  Author: John Ericson 
  Date:   2016-12-27 (Tue, 27 Dec 2016)

  Changed paths:
M pkgs/top-level/release-cross.nix
M pkgs/top-level/release-lib.nix

  Log Message:
  ---
  release-cross: Use the same genAttrs logic for `testOnCross` as `testOn`

Eventually we'll want to test cross-compiling *from* various platforms. For
now, its good to be consistent.


  Commit: 916012121cb950d66ab04ff62eff16b2d94edb7f
  
https://github.com/NixOS/nixpkgs/commit/916012121cb950d66ab04ff62eff16b2d94edb7f
  Author: John Ericson 
  Date:   2016-12-27 (Tue, 27 Dec 2016)

  Changed paths:
M pkgs/top-level/release-lib.nix

  Log Message:
  ---
  release-cross: Factor out system filtering


  Commit: 1d0e91831be906e63bdcd9d32ff721b67462699b
  
https://github.com/NixOS/nixpkgs/commit/1d0e91831be906e63bdcd9d32ff721b67462699b
  Author: John Ericson 
  Date:   2016-12-29 (Thu, 29 Dec 2016)

  Changed paths:
M pkgs/top-level/release-cross.nix

  Log Message:
  ---
  release-cross: Test for unchanged native derivations

These derivations do not care about the target platform, and thus should
not be affected by cross-compiling. Currently, these tests *fail*, but they
will be fixed soon by a latter PR. The release-cross job doesn't block a
channel, so this should be no problem.


  Commit: 614ae8f66042dd9337d8fbc1375abc2cea700d39
  
https://github.com/NixOS/nixpkgs/commit/614ae8f66042dd9337d8fbc1375abc2cea700d39
  Author: John Ericson 
  Date:   2016-12-29 (Thu, 29 Dec 2016)

  Changed paths:
M pkgs/top-level/release-cross.nix
M pkgs/top-level/release-lib.nix

  Log Message:
  ---
  Merge pull request #21414 from Ericson2314/release-cross

Improve release-cross tests


Compare: https://github.com/NixOS/nixpkgs/compare/d15c62a2a013...614ae8f66042___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 489ba1: top-level: missing parentheses

2016-12-21 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 489ba1744cc2d007802934aa333d2f308da200b9
  
https://github.com/NixOS/nixpkgs/commit/489ba1744cc2d007802934aa333d2f308da200b9
  Author: Eric Litak 
  Date:   2016-12-20 (Tue, 20 Dec 2016)

  Changed paths:
M pkgs/top-level/default.nix

  Log Message:
  ---
  top-level: missing parentheses


  Commit: b6f8b0d911cc8715c8c4782e1935aca170273a7b
  
https://github.com/NixOS/nixpkgs/commit/b6f8b0d911cc8715c8c4782e1935aca170273a7b
  Author: John Ericson 
  Date:   2016-12-21 (Wed, 21 Dec 2016)

  Changed paths:
M pkgs/top-level/default.nix

  Log Message:
  ---
  Merge pull request #21324 from elitak/parens

top-level: missing parentheses


Compare: https://github.com/NixOS/nixpkgs/compare/3ffb5ba60c4c...b6f8b0d911cc___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 508d94: zdoom: Fix typo from 1cc9d9ef2ce80dee5c8f2ef9f8ae2...

2016-12-18 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 508d9499b1e4a90602bf2d2cbc5c62f2aafd021f
  
https://github.com/NixOS/nixpkgs/commit/508d9499b1e4a90602bf2d2cbc5c62f2aafd021f
  Author: John Ericson 
  Date:   2016-12-18 (Sun, 18 Dec 2016)

  Changed paths:
M pkgs/games/zdoom/default.nix

  Log Message:
  ---
  zdoom: Fix typo from 1cc9d9ef2ce80dee5c8f2ef9f8ae20ae76337d73


___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] a94af7: linux stdenv: Fix assert that broke tests...and hy...

2016-12-15 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: a94af71da71ebc4a52c002891d813cf2689fc950
  
https://github.com/NixOS/nixpkgs/commit/a94af71da71ebc4a52c002891d813cf2689fc950
  Author: John Ericson 
  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 
  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 
  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 
  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 
  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


[Nix-commits] [NixOS/nixpkgs] ddeb0d: top-level: Stop exposing all stdenvs

2016-12-05 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: ddeb0d2d6b2e71cf98ab50ab376f802cf29c7c22
  
https://github.com/NixOS/nixpkgs/commit/ddeb0d2d6b2e71cf98ab50ab376f802cf29c7c22
  Author: John Ericson 
  Date:   2016-11-30 (Wed, 30 Nov 2016)

  Changed paths:
M pkgs/stdenv/cross/default.nix
M pkgs/stdenv/custom/default.nix
M pkgs/stdenv/default.nix
M pkgs/top-level/stdenv.nix

  Log Message:
  ---
  top-level: Stop exposing all stdenvs


  Commit: 2df990967be3c21f074c56682f8fa47bdd7cba7b
  
https://github.com/NixOS/nixpkgs/commit/2df990967be3c21f074c56682f8fa47bdd7cba7b
  Author: John Ericson 
  Date:   2016-11-30 (Wed, 30 Nov 2016)

  Changed paths:
M pkgs/stdenv/cross/default.nix
M pkgs/stdenv/custom/default.nix

  Log Message:
  ---
  Move up `inherit` binding for consistency


  Commit: 07a2b17cbf541c485e04f1a8ec98ffe8c24ac713
  
https://github.com/NixOS/nixpkgs/commit/07a2b17cbf541c485e04f1a8ec98ffe8c24ac713
  Author: John Ericson 
  Date:   2016-11-30 (Wed, 30 Nov 2016)

  Changed paths:
M pkgs/top-level/default.nix
A pkgs/top-level/stage.nix

  Log Message:
  ---
  top-level: Split some of `pkgs/top-level/default.nix` to 
`pkgs/top-level/stage.nix`

This is preparation for the latter just building a single stage, and the
former building a package set with the bootstrapped stdenv.


  Commit: d240a0da1ab03ef8838553229b72b9b37a0ef3e7
  
https://github.com/NixOS/nixpkgs/commit/d240a0da1ab03ef8838553229b72b9b37a0ef3e7
  Author: John Ericson 
  Date:   2016-11-30 (Wed, 30 Nov 2016)

  Changed paths:
M pkgs/stdenv/cross/default.nix
M pkgs/stdenv/custom/default.nix
M pkgs/stdenv/darwin/default.nix
M pkgs/stdenv/default.nix
M pkgs/stdenv/freebsd/default.nix
M pkgs/stdenv/linux/default.nix
M pkgs/stdenv/native/default.nix
M pkgs/top-level/default.nix
M pkgs/top-level/stage.nix
R pkgs/top-level/stdenv.nix

  Log Message:
  ---
  top-level: Remove cycles: stdenv calls in top-level but not vice versa

This commit changes the dependencies of stdenv, and clean-up the stdenv
story by removing the `defaultStdenv` attribute as well as the `bootStdenv`
parameter.

Before, the final bootstrapping stage's stdenv was provided by
all-packages, which was iterating multiple times over the
top-level/default.nix expression, and non-final bootstrapping stages'
stdenvs were explicitly specified with the `bootStdenv` parameter.

Now, all stages' stdenvs are specified with the `stdenv` parameter.
For non-final bootstrapping stages, this is a small change---basically just
rename the parameter.
For the final stage, top-level/default.nix takes the chosen stdenv and
makes the final stage with it.

`allPackages` is used to make all bootstrapping stages, final and
non-final alike. It's basically the expression of `stage.nix` (along with a
few partially-applied default arguments)

Note, the make-bootstrap-tools scripts are temporarily broken


  Commit: 39753f5360134f1aab1a949260374a876c0983eb
  
https://github.com/NixOS/nixpkgs/commit/39753f5360134f1aab1a949260374a876c0983eb
  Author: John Ericson 
  Date:   2016-11-30 (Wed, 30 Nov 2016)

  Changed paths:
M pkgs/stdenv/cross/default.nix
M pkgs/stdenv/custom/default.nix
M pkgs/stdenv/darwin/default.nix
M pkgs/stdenv/default.nix
M pkgs/stdenv/linux/default.nix
M pkgs/stdenv/native/default.nix
M pkgs/top-level/default.nix

  Log Message:
  ---
  top-level: Close over fewer arguments for stdenv stages

This makes the flow of data easier to understand. There's little downside
because the args in question are already inspected by the stdenvs.

cross-compiling in particular is simpler because we don't need to worry
about overriding the config closed over by `allPackages`.


  Commit: 05c12f147e932c990f4b026b9efe0b7a1985461e
  
https://github.com/NixOS/nixpkgs/commit/05c12f147e932c990f4b026b9efe0b7a1985461e
  Author: John Ericson 
  Date:   2016-12-01 (Thu, 01 Dec 2016)

  Changed paths:
M pkgs/top-level/default.nix
M pkgs/top-level/platforms.nix

  Log Message:
  ---
  top-level: Move default-choosing logic to top-level/platforms.nix

This mirrors stdenv/default.nix


  Commit: a55d1ecc9050a50904a13e3a34535990b9e61ae3
  
https://github.com/NixOS/nixpkgs/commit/a55d1ecc9050a50904a13e3a34535990b9e61ae3
  Author: John Ericson 
  Date:   2016-12-01 (Thu, 01 Dec 2016)

  Changed paths:
M pkgs/top-level/default.nix

  Log Message:
  ---
  top-level: Document why `nixpkgsFun` doesn't close over inferred default 
arguments


  Commit: 4751d9e5ad124284dbd719d3a58f42d56f1b9514
  
https://github.com/NixOS/nixpkgs/commit/4751d9e5ad124284dbd719d3a58f42d56f1b9514
  Author: John Ericson 
  Date:   2016-12-01 (Thu, 01 Dec 2016)

  Changed paths:
M pkgs/stdenv/custom/default.nix
M pkgs/stdenv/darwin/default.nix
M pkgs/stdenv/de

[Nix-commits] [NixOS/nixpkgs] f68e16: top-level: Make cross compiling slightly saner

2016-11-12 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: f68e16f0235989f11ad7394edf656649c652bef4
  
https://github.com/NixOS/nixpkgs/commit/f68e16f0235989f11ad7394edf656649c652bef4
  Author: John Ericson 
  Date:   2016-11-12 (Sat, 12 Nov 2016)

  Changed paths:
M pkgs/stdenv/cross/default.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  top-level: Make cross compiling slightly saner

Removes the weird stdenv cycle used to match the old infrastructure.
It turns out that matching it so precisely is not needed.


___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 05977b: top-level: Remove redundant parentheses

2016-11-08 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 05977b236b2a925983224c24d6e14aed796e7a14
  
https://github.com/NixOS/nixpkgs/commit/05977b236b2a925983224c24d6e14aed796e7a14
  Author: John Ericson 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

  Changed paths:
M pkgs/top-level/default.nix

  Log Message:
  ---
  top-level: Remove redundant parentheses


  Commit: 68a04c1195ba8087f0f57c5b9017b38a02a8c6c1
  
https://github.com/NixOS/nixpkgs/commit/68a04c1195ba8087f0f57c5b9017b38a02a8c6c1
  Author: John Ericson 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

  Changed paths:
M pkgs/top-level/default.nix
M pkgs/top-level/stdenv.nix

  Log Message:
  ---
  top-level: Inline topLevelArugments, and make pkg named arg for stdenv

[Trying my best to indent properly while avoiding excessive drift]


  Commit: eed34bd214d6f513a859f3cfc52b266a9d19898b
  
https://github.com/NixOS/nixpkgs/commit/eed34bd214d6f513a859f3cfc52b266a9d19898b
  Author: John Ericson 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

  Changed paths:
M pkgs/top-level/all-packages.nix
M pkgs/top-level/default.nix
M pkgs/top-level/stdenv.nix

  Log Message:
  ---
  top-level: Remove redundant arguments from top-level/{all-package,stdenv}.nix


  Commit: e22346c35ee8cb872d0587320083ba44230bd44b
  
https://github.com/NixOS/nixpkgs/commit/e22346c35ee8cb872d0587320083ba44230bd44b
  Author: John Ericson 
  Date:   2016-11-06 (Sun, 06 Nov 2016)

  Changed paths:
A pkgs/stdenv/cross/default.nix
M pkgs/stdenv/default.nix
M pkgs/top-level/default.nix
M pkgs/top-level/stdenv.nix

  Log Message:
  ---
  top-level: Make stdenvCross which appears at first glance normal...

...but actually is weird just like the original


  Commit: ea7bf0226825e21555eda1fd57d93762b376188d
  
https://github.com/NixOS/nixpkgs/commit/ea7bf0226825e21555eda1fd57d93762b376188d
  Author: John Ericson 
  Date:   2016-11-06 (Sun, 06 Nov 2016)

  Changed paths:
M pkgs/top-level/default.nix
M pkgs/top-level/stdenv.nix

  Log Message:
  ---
  top-level: `top-level/stdenv.nix` no longer needs `pkg` argument


  Commit: 6bfe04277f40a0da27fa6373edfb24a6b139548b
  
https://github.com/NixOS/nixpkgs/commit/6bfe04277f40a0da27fa6373edfb24a6b139548b
  Author: John Ericson 
  Date:   2016-11-06 (Sun, 06 Nov 2016)

  Changed paths:
M pkgs/stdenv/cross/default.nix
A pkgs/stdenv/custom/default.nix
M pkgs/stdenv/default.nix
M pkgs/top-level/stdenv.nix

  Log Message:
  ---
  top-level: Make config-overriden stdenv bootstrap more normally


  Commit: a24728fe295f28648f1812b3565541f7ef6269f1
  
https://github.com/NixOS/nixpkgs/commit/a24728fe295f28648f1812b3565541f7ef6269f1
  Author: John Ericson 
  Date:   2016-11-08 (Tue, 08 Nov 2016)

  Changed paths:
A pkgs/stdenv/cross/default.nix
A pkgs/stdenv/custom/default.nix
M pkgs/stdenv/default.nix
M pkgs/top-level/all-packages.nix
M pkgs/top-level/default.nix
M pkgs/top-level/stdenv.nix

  Log Message:
  ---
  Merge pull request #20108 from Ericson2314/top-level-cleanup

Move stdenvCross and customStdenv to pkgs/stdenv


Compare: https://github.com/NixOS/nixpkgs/compare/febf3cfd34b5...a24728fe295f___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] a11338: top-level: Use `nixpkgsFun` to avoid import ../..

2016-11-02 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: a113382f2c8557ede623e392be6a294b8a6aa545
  
https://github.com/NixOS/nixpkgs/commit/a113382f2c8557ede623e392be6a294b8a6aa545
  Author: John Ericson 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

  Changed paths:
M pkgs/top-level/all-packages.nix
M pkgs/top-level/default.nix
M pkgs/top-level/stdenv.nix

  Log Message:
  ---
  top-level: Use `nixpkgsFun` to avoid import ../..


___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


Re: [Nix-dev] cabal-install 1.24's Nix-style builds, and a new style of Nix + language package manager integration

2016-09-24 Thread John Ericson
Hi Peter,

Thanks for trying and sorry I haven't been able to articulate this
well. You left a similar comment about the same time, and I responded
in https://github.com/haskell/cabal/issues/3882#issuecomment-249312464,
but for the benefit of this list I will recap and expand here.

The primary purpose of my plan is to make our Haskell infrastructure
smaller and simpler by leveraging cabal-install, *not* to add more
features. A lot of work goes into cabal2nix, and I think we can get
the same functionality with less of a maintenance burden. I want to
make it so there is as little overlap as possible between our Haskell
infrastructure (especially cabal2nix) and cabal-install. [Finally,
there's no reason we couldn't do the same with Stack; I am starting
with cabal-install because I think it's new features make working with
it easier.]

Now, one concrete problem I did mention in the first post of this
thread is working with packages that have compiler-specific metadata,
like GHCJS-specific dependencies. But that has actually been recently
fixed with https://github.com/NixOS/cabal2nix/pull/230, and is thus
*not* an example of something that can *only* be solved with my plan.
But it does serve an example of the type of maintenance work I'd like
to obviate: I only see more complications to evaluating cabal files
like "impl(ghcjs)" appearing in the future, and it would be nice to
avoid cabal2nix always playing catch-up, implementing them after
Cabal.

If we can put my basic proposal in place, there is follow up work that
will yield actual new features, such as nicer local development of
multiple packages that is more similar to (the good parts of) non-Nix
workflows, working with LTSes again or other upstream package sets
without bloating nixpkgs, and more. But this stuff is a bit more
experimental and I rather "sell" my idea on the just the benefit of
less maintenance and complexity alone.

Hope that helps,

John

On Fri, Sep 23, 2016 at 1:19 PM, Peter Simons  wrote:
> Hi John,
>
> I have really tried my best to understand what exactly it is you are
> suggesting in this thread and why that suggestion might be desirable,
> but I haven't been able to grok your proposal.
>
> Would it be possible to explain your thoughts using a *concrete*
> example, i.e. could you maybe give us a *specific* example of a use-case
> that does not work today, but that would work correctly if your proposal
> were implemented?
>
> Best regards,
> Peter
>
> ___
> nix-dev mailing list
> nix-dev@lists.science.uu.nl
> http://lists.science.uu.nl/mailman/listinfo/nix-dev
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev


Re: [Nix-dev] cabal-install 1.24's Nix-style builds, and a new style of Nix + language package manager integration

2016-09-21 Thread John Ericson
I wrote an issue for Cabal that goes into more detail at what the Cabal end
of things might look like: https://github.com/haskell/cabal/issues/3882

On Sun, Sep 18, 2016 at 11:48 PM, John Ericson <
john_eric...@alumni.brown.edu> wrote:

> After much pondering, I've decided the best way to work with
> language-specific build managers is for them to come up with the end-to-end
> build plan, and us to build each package in that build plan.
>
> Our current method with Haskell of trying to replicate each package and
> all the possible ways it can be configured just doesn't scale very well
> with respect to configuaration options. Things like `if impl(ghcjs):` have
> long remained unimplemented, and implementing them bakes more and more
> build-plan resolution machinery into machine until we approach
> re-implementing cabal-install. [Peti has discussed this in depth in
> https://github.com/NixOS/cabal2nix/blob/master/doc/03-
> map-cabal-files-to-nix-without-information-loss.md.]
>
> At the same time, or current method isn't great for developing multiple
> packages simultaneously. The default thing to do is make a package set with
> each one, but if one doesn't handle the source very carefully, a change to
> any of them will cause them all to be rebuilt. Furthermore, one needs
> switch shells per each package---which is a pain in itself---and that
> prevents the use of neat things like `stack repl` which interprets multiple
> packages at once for seamless concurrent development. [I discussed part of
> this in https://github.com/NixOS/nixpkgs/issues/10902 a bit.]
>
> `stack --nix` at first glance seems to solve both of these areas, but in
> fact comes with it's own set of downsides. Yes, since Stack manages the
> build plan less knowledge is needed on the nix side, but stack also
> *executes* the build plan. This means that both Nix's superior caching is
> not utilized, and per-package patches (like foreign dependencies) are
> unavailable. [See https://github.com/NixOS/nixpkgs/issues/15995.]
>
> What I'm proposing should give us the best of both worlds in that language
> package manager makes most of the decisions, but we still have an
> opportunity to cache and patch, and development and deployment workflows
> overlap as much as possible. This methodology could in principle work with
> any language and its package manager, but I single out Cabal+Haskell
> because the new Nix-style workflow (http://cabal.readthedocs.io/
> en/latest/nix-local-build.html) makes it the most ready.
>
> For both deployment and development, the idea is we first run
> cabal-install to compute a build plan. During this stage it in principle
> only needs access to .cabal files / the Hackage index and a project
> config---certainly not any already built binaries like today. Next we
> instruct cabal-install to decompose the plan into "sub plans" for each
> dependency/would-be system package---this is the biggest change needed for
> cabal-install, but one that any system package manager could leverage, not
> just us. After that, using a reworked cabal2nix, we convert each of those
> plans to a Nix derivation---this may include turning hackage deps into
> local deps with their source fetched by nix. Finally, each of those
> derivations can use `cabal new-install` to install their root package, and
> the caches/package DBs can be passed downstream and combined just like
> today.
>
> There are two important concepts to note here: First, naively, the use of
> entire sub plans in each Nix derivation would cause cabal-install to
> rebuild each dependency for package in the plan that depends that needs it,
> but since the Nix derivations will also depend on each other, `cabal
> new-build`'s own caching should kick in so each Nix derivation does in fact
> correspond to each Haskell package being built. Second, while cabal-install
> can be instructed to build any package in a plan, the decomposition of
> build plans is necessary so build plans that differ in ways that don't
> affect common dependencies still end up sharing nix-executed builds. In
> both cases, we rely on cabal-install's imitation of our methodology.
>
> For development, we leverage the new nix-style build's preexisting notion
> of a local vs external package. For convenience, it's probably best to let
> cabal-install devise the build plan impurely (this is analogous to
> non-restricted mode for Nix expr evaluation), and not copy any local
> sources to the Nix store. Then, only external packages (and only those
> which are dependencies of the current goal) should be built by Nix in
> accordance with the plan above. In a shell with those built, cabal-install
> can be run again building local packages n

[Nix-dev] cabal-install 1.24's Nix-style builds, and a new style of Nix + language package manager integration

2016-09-18 Thread John Ericson
After much pondering, I've decided the best way to work with
language-specific build managers is for them to come up with the end-to-end
build plan, and us to build each package in that build plan.

Our current method with Haskell of trying to replicate each package and all
the possible ways it can be configured just doesn't scale very well with
respect to configuaration options. Things like `if impl(ghcjs):` have long
remained unimplemented, and implementing them bakes more and more
build-plan resolution machinery into machine until we approach
re-implementing cabal-install. [Peti has discussed this in depth in
https://github.com/NixOS/cabal2nix/blob/master/doc/03-map-cabal-files-to-nix-without-information-loss.md
.]

At the same time, or current method isn't great for developing multiple
packages simultaneously. The default thing to do is make a package set with
each one, but if one doesn't handle the source very carefully, a change to
any of them will cause them all to be rebuilt. Furthermore, one needs
switch shells per each package---which is a pain in itself---and that
prevents the use of neat things like `stack repl` which interprets multiple
packages at once for seamless concurrent development. [I discussed part of
this in https://github.com/NixOS/nixpkgs/issues/10902 a bit.]

`stack --nix` at first glance seems to solve both of these areas, but in
fact comes with it's own set of downsides. Yes, since Stack manages the
build plan less knowledge is needed on the nix side, but stack also
*executes* the build plan. This means that both Nix's superior caching is
not utilized, and per-package patches (like foreign dependencies) are
unavailable. [See https://github.com/NixOS/nixpkgs/issues/15995.]

What I'm proposing should give us the best of both worlds in that language
package manager makes most of the decisions, but we still have an
opportunity to cache and patch, and development and deployment workflows
overlap as much as possible. This methodology could in principle work with
any language and its package manager, but I single out Cabal+Haskell
because the new Nix-style workflow (
http://cabal.readthedocs.io/en/latest/nix-local-build.html) makes it the
most ready.

For both deployment and development, the idea is we first run cabal-install
to compute a build plan. During this stage it in principle only needs
access to .cabal files / the Hackage index and a project config---certainly
not any already built binaries like today. Next we instruct cabal-install
to decompose the plan into "sub plans" for each dependency/would-be system
package---this is the biggest change needed for cabal-install, but one that
any system package manager could leverage, not just us. After that, using a
reworked cabal2nix, we convert each of those plans to a Nix
derivation---this may include turning hackage deps into local deps with
their source fetched by nix. Finally, each of those derivations can use
`cabal new-install` to install their root package, and the caches/package
DBs can be passed downstream and combined just like today.

There are two important concepts to note here: First, naively, the use of
entire sub plans in each Nix derivation would cause cabal-install to
rebuild each dependency for package in the plan that depends that needs it,
but since the Nix derivations will also depend on each other, `cabal
new-build`'s own caching should kick in so each Nix derivation does in fact
correspond to each Haskell package being built. Second, while cabal-install
can be instructed to build any package in a plan, the decomposition of
build plans is necessary so build plans that differ in ways that don't
affect common dependencies still end up sharing nix-executed builds. In
both cases, we rely on cabal-install's imitation of our methodology.

For development, we leverage the new nix-style build's preexisting notion
of a local vs external package. For convenience, it's probably best to let
cabal-install devise the build plan impurely (this is analogous to
non-restricted mode for Nix expr evaluation), and not copy any local
sources to the Nix store. Then, only external packages (and only those
which are dependencies of the current goal) should be built by Nix in
accordance with the plan above. In a shell with those built, cabal-install
can be run again building local packages normally and locally using its
more fine-grained per-file hashing and enabling tricks analogous to
`stack-repl`. While the default shell derivation will need tweaking if any
local packages have special requirements like foreign dependencies, this is
better than with `stack --nix` where the shell needs tweaking if *any*
dependency has such special requirements.
like today.

For deployment we don't need to worry about local vs external packages, and
on the cabal-install side `cabal new-install` should treat them all the
same IIUC. However, we do need to make sure that the build plan resolution
can be done in a pure environment: this means making sure all 

Re: [Nix-dev] typed nix

2016-09-17 Thread John Ericson
Row polymorphism for extensions of attribute sets, and Mu types for all our
stuff with fix-points. I believe that whenever we have have dynamic keys,
all values have the same type so plain old maps will suffice; if this is
not quite the case then we should refactor to make it the case.

On Wed, Aug 31, 2016 at 12:40 PM, stewart mackenzie 
wrote:

> P "Nix won't be complete until it has static typing." Nice.
>
> > highly nontrivial...
>
> No doubt, but having that speed up would be quite nice. Especially when
> using nix as a 'replacement' for make. It's the future!
>
> What would the language even look like?
>
> On 1 Sep 2016 03:29, "Vladimír Čunát"  wrote:
> > There's a ticket open:
> > https://github.com/NixOS/nix/issues/14
> > but IMO someone should first think through the implications,
> > as I suspect they'll be highly nontrivial...
>
> ___
> nix-dev mailing list
> nix-dev@lists.science.uu.nl
> http://lists.science.uu.nl/mailman/listinfo/nix-dev
>
>
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev


[Nix-commits] [NixOS/nixpkgs] 307e80: makeRustPlatform: Remove `self` argument (#16932)

2016-07-22 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 307e8098c50b4b6dece915b60e909390e69de0bb
  
https://github.com/NixOS/nixpkgs/commit/307e8098c50b4b6dece915b60e909390e69de0bb
  Author: John Ericson 
  Date:   2016-07-23 (Sat, 23 Jul 2016)

  Log Message:
  ---
  makeRustPlatform: Remove `self` argument (#16932)


___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] bed2a1: makeRustPlatform: Remove `self` argument

2016-07-15 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: bed2a14afaf720ca9f2c0f6a747ca8f8490ddbab
  
https://github.com/NixOS/nixpkgs/commit/bed2a14afaf720ca9f2c0f6a747ca8f8490ddbab
  Author: John Ericson 
  Date:   2016-07-15 (Fri, 15 Jul 2016)

  Changed paths:
M pkgs/development/compilers/rust/default.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  makeRustPlatform: Remove `self` argument


___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] f073df: Replace `./../*` with `../*` in Nix expressions (#...

2016-06-22 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: f073df60d60444c30c49cb26d6b187a4100b41fe
  
https://github.com/NixOS/nixpkgs/commit/f073df60d60444c30c49cb26d6b187a4100b41fe
  Author: John Ericson 
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
M doc/default.nix
M lib/tests/release.nix
M pkgs/top-level/all-packages.nix
M pkgs/top-level/guile-2-test.nix
M pkgs/top-level/release-lib.nix
M pkgs/top-level/release-python.nix
M pkgs/top-level/release-small.nix
M pkgs/top-level/release.nix
M pkgs/top-level/stdenv.nix

  Log Message:
  ---
  Replace `./../*` with `../*` in Nix expressions (#16414)


___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-dev] Download all of hackage

2015-10-20 Thread John Ericson
I agree that we over use overrides, and agree with Peter's proposals. But I
think the first step needs to be scraping (not necessarily building!) all of
package.

  {
"foo" = {
  "0_1_2_3" = ;
  "1_2_3_4" = ;
  ...
}
"bar" = ...;
...
  }

This would allow conservative users to override their nixpkgs with a newer
scrape rather than be forced to upgrade.

I'm not sure what sort of auto-generated overrides we do now, but I'd guess
those ought to be implemented as a big map over the scrape.

Configurations would have a "type" of something like:

  {
versions:Map package-name ([version] -> Nullable version);
extraConfigs:Map package-name (fixed-pkg-set -> extra-config-set);
defaultFallback: [version] -> Nullable version)
  }

the idea is use the pkg-specific, else fallback function to pick the right
version, where null means don't include in final set. Then use the extra
config function to provide/override args to extraConfig if there is
one.[Exactly how we want to do overriding/exposed config/etc I'll leave to
the other thread.]

Some examples. A bleeding-edge configuration would have `defaultFallback =
max`, while `haskellPackages` would have fixed versions for everything, so
as not to break on re-scrapes.

___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev


Re: [Nix-dev] Map Cabal Files To Nix Without Information Loss

2015-10-20 Thread John Ericson
Skipping to your tentative proposal.

> Possible Improvements
> -
> 
> Nix expressions must capture the complete logic that the underlying
> Cabal file specifies. In case of the conduit example, the generated code
> should say:
> 
> libraryHaskellDepends = [
>   base exceptions lifted-base mmorph mtl resourcet transformers
>   transformers-base
> ] ++ stdenv.lib.optional (stdenv.lib.versionOlder ghc.version "7.9") void;
> 
> Furthermore, Cabal flags should be mapped to boolean function arguments
> that enable/disable the underlying feature and thereby modify how the
> Nix expression evaluates, so that no extraneous build inputs occur.
> 

I was thinking about how do craft the function for `callPackage` to respect
this. [One problem with the reflection trick is it breaks eta-expansion,
which greatly ties ours hand when trying to craft combinators, etc.]

  { base, ...etc...,
void ? assert !(stdenv.lib.versionOlder ghc.version "7.9"); null
  }: ...

Seems to get the job, except how will ghc be in scope? There is a similar
staging issue with getting cabal flag args in scope before conditional deps.

___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev