GHCJS uses integer-gmp, but cabal2nix generates a dependency list that
includes integer-simple instead. This tweaks the stage2 generator to
replace any instance of integer-simple with integer-gmp.
Things currently still work without this change (assuming
integer-simple is defined as null), as ghcjs includes integer-gmp in
its stage1 packages - so it's always available.
However, this change makes things a bit more explicit, rather than
leaving things to chance. If at any point the stage1 packages are also
split up into separate derivations, the integer-gmp package will need to
be passed along to the packages that depend on it. This change should
prevent some confusion going forward.
Previously, we were compiling Setup.hs with ghcjs (instead of ghc),
and that required that Cabal be available, otherwise the Setup.hs would
fail to compile.
Now that we are compiling Setup.hs with ghc, it's no longer necessary
to add Cabal as a dependency to all ghcjs packages.
This update was generated by hackage2nix v20151217-10-ga610b1b using the following inputs:
- Nixpkgs: 94492ca848
- Hackage: b3a9ab4a60
- LTS Haskell: e7c3629999
- Stackage Nightly: b98e7e2d4f
This update was generated by hackage2nix v20151217-10-ga610b1b using the following inputs:
- Nixpkgs: 45176e62ca
- Hackage: 4eb7681703
- LTS Haskell: e7c3629999
- Stackage Nightly: a84b3a147a
This update was generated by hackage2nix v20151217-10-ga610b1b using the following inputs:
- Nixpkgs: e9a140b725
- Hackage: 346d9f8466
- LTS Haskell: 6661045692
- Stackage Nightly: 0ad9eda835
This update was generated by hackage2nix v20151217-9-geddefc2 using the following inputs:
- Nixpkgs: 34e1e2890f
- Hackage: 152c587fd1
- LTS Haskell: 9b9c0dc0e3
- Stackage Nightly: 486fdffc71
This update was generated by hackage2nix v20151217-9-geddefc2 using the following inputs:
- Nixpkgs: 066b92d429
- Hackage: e664cee71e
- LTS Haskell: 9b9c0dc0e3
- Stackage Nightly: c5293e6b9b
This update was generated by hackage2nix v20151217-9-geddefc2 using the following inputs:
- Nixpkgs: a28e076b47
- Hackage: c63083af59
- LTS Haskell: cf055c2754
- Stackage Nightly: 8f10b44c12
This update was generated by hackage2nix v20151217-9-geddefc2 using the following inputs:
- Nixpkgs: 4f74881496
- Hackage: b70bc194ef
- LTS Haskell: cf055c2754
- Stackage Nightly: 3184791ff4
This update was generated by hackage2nix v20151217-9-geddefc2 using the following inputs:
- Nixpkgs: 3a04b0b2d4
- Hackage: e505b113f6
- LTS Haskell: e72964a553
- Stackage Nightly: 14a3a2d00e
This update was generated by hackage2nix v20151217-7-g3384c26 using the following inputs:
- Nixpkgs: 65d4f18f9e
- Hackage: 03c5ce2cbc
- LTS Haskell: e72964a553
- Stackage Nightly: 23478137ac
This update was generated by hackage2nix v20151217-7-g3384c26 using the following inputs:
- Nixpkgs: 7cbc1f27d4
- Hackage: dfdbb526ed
- LTS Haskell: e72964a553
- Stackage Nightly: a9df6f5b32
This update was generated by hackage2nix v20151217-6-g3c230ba using the following inputs:
- Nixpkgs: fbf35cf17d
- Hackage: 3e0920b425
- LTS Haskell: e72964a553
- Stackage Nightly: c0de8ca462
This update was generated by hackage2nix v20151217-6-g3c230ba using the following inputs:
- Nixpkgs: b05b64ed59
- Hackage: ce76547c84
- LTS Haskell: 87e2d54643
- Stackage Nightly: 392791fc31
This update was generated by hackage2nix v20151217-5-ged07a8e using the following inputs:
- Nixpkgs: f24e81fbd3
- Hackage: 01c9e56f5d
- LTS Haskell: 87e2d54643
- Stackage Nightly: c30758374f
This update was generated by hackage2nix v20151217-5-ged07a8e using the following inputs:
- Nixpkgs: 665c16fbe1
- Hackage: d9755ca900
- LTS Haskell: d3e5ae70f9
- Stackage Nightly: 56e1f693d5
This update was generated by hackage2nix v20151217-3-gd4ae18a using the following inputs:
- Nixpkgs: 579e6bb797
- Hackage: e1530f9f9a
- LTS Haskell: d3e5ae70f9
- Stackage Nightly: db90cf927d
This update was generated by hackage2nix v20151217-3-gd4ae18a using the following inputs:
- Nixpkgs: 236677809b
- Hackage: 62b6b580fb
- LTS Haskell: d3e5ae70f9
- Stackage Nightly: ef03f60b53
This update was generated by hackage2nix v20151217-2-g519e0a9 using the following inputs:
- Nixpkgs: 2ed14d2303
- Hackage: 53c15ee9e3
- LTS Haskell: b668f53a86
- Stackage Nightly: ec9500b675
This update was generated by hackage2nix v20151217 using the following inputs:
- Nixpkgs: 1e4c0752db
- Hackage: 42db5021ee
- LTS Haskell: 253d4da342
- Stackage Nightly: 57c8505aea
This update was generated by hackage2nix v20150922-47-ga631ea6 using the following inputs:
- Nixpkgs: e616e3fbaa
- Hackage: 1be87a125d
- LTS Haskell: 253d4da342
- Stackage Nightly: 1ee60f7320
This update was generated by hackage2nix v20150922-47-ga631ea6 using the following inputs:
- Nixpkgs: e64881f25c
- Hackage: bc415aa435
- LTS Haskell: 80256aab76
- Stackage Nightly: fd1a4b498e
This update was generated by hackage2nix v20150922-46-gf1bbc76 using the following inputs:
- Nixpkgs: 4619baf1f6
- Hackage: 4269955365
- LTS Haskell: 57dab1c997
- Stackage Nightly: 87110f79ed
This update was generated by hackage2nix v20150922-46-gf1bbc76 using the following inputs:
- Nixpkgs: 02a00be50f
- Hackage: 2c186df615
- LTS Haskell: 57dab1c997
- Stackage Nightly: c3ba1c0c15
This update was generated by hackage2nix v20150922-46-gf1bbc76 using the following inputs:
- Nixpkgs: 7c559e1c0f
- Hackage: 49a7fb0a6f
- LTS Haskell: 57dab1c997
- Stackage Nightly: ecefc78ca3
This update was generated by hackage2nix v20150922-46-gf1bbc76 using the following inputs:
- Nixpkgs: f9c10dd1aa
- Hackage: fda7f3f477
- LTS Haskell: 57dab1c997
- Stackage Nightly: a30c2abd60
This update was generated by hackage2nix v20150922-46-gf1bbc76 using the following inputs:
- Nixpkgs: 7b12664abe
- Hackage: 624aeb0d41
- LTS Haskell: 57dab1c997
- Stackage Nightly: dc4725639c
This update was generated by hackage2nix v20150922-45-g1161457 using the following inputs:
- Nixpkgs: 6cdcd0db5c
- Hackage: e774e54800
- LTS Haskell: 89c3b45370
- Stackage Nightly: caa131e677
These functions used to live in pkgs/development/haskell-modules/default.nix,
but they are generic, really, and should be easily accessible to everyone.
This update was generated by hackage2nix v20150922-45-g1161457 using the following inputs:
- Nixpkgs: 8a5e5c46a1
- Hackage: c8d16c7fd2
- LTS Haskell: 89c3b45370
- Stackage Nightly: 98e337bf6b
This update was generated by hackage2nix v20150922-44-g2042044 using the following inputs:
- Nixpkgs: 8d34a1fc4b
- Hackage: 770d6964c5
- LTS Haskell: 8ec1fc3419
- Stackage Nightly: 5236aaf576
This update was generated by hackage2nix v20150922-42-g3ca1747 using the following inputs:
- Nixpkgs: ad0723f0c7
- Hackage: c7478af457
- LTS Haskell: 8ec1fc3419
- Stackage Nightly: e6bcfb640c
This update was generated by hackage2nix v20150922-36-ge0ee7ef using the following inputs:
- Nixpkgs: 7c001f31b0
- Hackage: 46f2de463b
- LTS Haskell: 1ae555e197
- Stackage Nightly: 4113b2e369
This update was generated by hackage2nix v20150922-36-ge0ee7ef using the following inputs:
- Nixpkgs: 29fff27a55
- Hackage: fccc42cccb
- LTS Haskell: 1ae555e197
- Stackage Nightly: ec7b421c66
This update was generated by hackage2nix v20150922-35-g816abb5 using the following inputs:
- Nixpkgs: 1df25a5f13
- Hackage: cb4ec9770f
- LTS Haskell: 71e581f8e4
- Stackage Nightly: 6fbe569da0
This update was generated by hackage2nix v20150922-35-g816abb5 using the following inputs:
- Nixpkgs: f90e42f382
- Hackage: 96af3096ee
- LTS Haskell: 71e581f8e4
- Stackage Nightly: 97a0714af7
This update was generated by hackage2nix v20150922-27-g14f44af using the following inputs:
- Nixpkgs: 296838820e
- Hackage: cbced5bc0e
- LTS Haskell: 4622b913dc
- Stackage Nightly: 05c38f5cda
This update was generated by hackage2nix v20150922-27-g14f44af using the following inputs:
- Nixpkgs: 07b9003464
- Hackage: b8c50379ae
- LTS Haskell: 4622b913dc
- Stackage Nightly: 05c38f5cda
This update was generated by hackage2nix v20150922-26-gcb66650 using the following inputs:
- Nixpkgs: 62a178f86b
- Hackage: d288879f8a
- LTS Haskell: 4622b913dc
- Stackage Nightly: 61e6f9dbeb
This update was generated by hackage2nix v20150922-23-g9db0d61 using the following inputs:
- Nixpkgs: 1146c867e3
- Hackage: 1791c0e414
- LTS Haskell: 4622b913dc
- Stackage Nightly: f51b9b1513
This update was generated by hackage2nix v20150922-22-g7ae1e4c using the following inputs:
- Nixpkgs: ecd4f778f1
- Hackage: 873ad146ce
- LTS Haskell: 0c2d9478c4
- Stackage Nightly: 3f21ac8e0f
This update was generated by hackage2nix v20150922-18-g676e5bd using the following inputs:
- Nixpkgs: 0d6c2ccabf
- Hackage: 4571e32cd9
- LTS Haskell: 0d493eae36
- Stackage Nightly: c10e6d05fe
This update was generated by hackage2nix v20150922-17-gacb24c5 using the following inputs:
- Nixpkgs: d16b4a3e78
- Hackage: bf464d8754
- LTS Haskell: 0d493eae36
- Stackage Nightly: a19cf709b3
This update was generated by hackage2nix v20150922-18-g943a6d6 using the following inputs:
- Nixpkgs: 8b34d449ff
- Hackage: 746b60ae21
- LTS Haskell: 0d493eae36
- Stackage Nightly: 6fbf34ed62
This update was generated by hackage2nix v20150922-18-g943a6d6 using the following inputs:
- Nixpkgs: b50d1833ba
- Hackage: 370eb30278
- LTS Haskell: 0d493eae36
- Stackage Nightly: 6fbf34ed62
This update was generated by hackage2nix v20150922-16-g255fd25 using the following inputs:
- Nixpkgs: 413771bf48
- Hackage: 34485133f3
- LTS Haskell: c5f1e507cd
- Stackage Nightly: c5032276f9
This update was generated by hackage2nix v20150922-11-gaf50139 using the following inputs:
- Nixpkgs: 2ff1ebc619
- Hackage: 6f52d0a4a2
- LTS Haskell: c5f1e507cd
- Stackage Nightly: 9351235d28
This update was generated by hackage2nix v20150922-8-g2bcda7a using the following inputs:
- Nixpkgs: 8af2f6e9c4
- Hackage: db7872f264
- LTS Haskell: 831a37566b
- Stackage Nightly: e5598095e1
This update was generated by hackage2nix v20150922-6-g5d5ccfe-dirty using the following inputs:
- Nixpkgs: 7a2a9bbe15
- Hackage: 82f4bbff1b
- LTS Haskell: 831a37566b
- Stackage Nightly: e7fd25c827
This update was generated by hackage2nix v20150922-6-g5d5ccfe using the following inputs:
- Nixpkgs: d64ca94227
- Hackage: 8f14dec431
- LTS Haskell: 831a37566b
- Stackage Nightly: e7fd25c827
This update was generated by hackage2nix v20150922-6-g5d5ccfe using the following inputs:
- Nixpkgs: f21f116631
- Hackage: f8855b5494
- LTS Haskell: 831a37566b
- Stackage Nightly: 96ef887f31
This update was generated by hackage2nix v20150922-6-g5d5ccfe using the following inputs:
- Nixpkgs: eaa43c65b3
- Hackage: c048a402d3
- LTS Haskell: c7012a704b
- Stackage Nightly: a74568b554
This update was generated by hackage2nix v20150922-4-g3df9130 using the following inputs:
- Nixpkgs: 5eb46915ca
- Hackage: 238be6f443
- LTS Haskell: c7012a704b
- Stackage Nightly: a46ea057c9
This update was generated by hackage2nix v20150903-85-gaab3160 using the following inputs:
- Hackage: d45d08e556
- LTS Haskell: da73308b63
- Stackage Nightly: 7d1956be84
This update was generated by hackage2nix v20150903-82-g351b6f8 using the following inputs:
- Hackage: af161fdf17
- LTS Haskell: da73308b63
- Stackage Nightly: 1994a4f865
These changes ensure that jailbreak-cabal works correctly without further
configuration even with older compilers. The exception to that rule being,
naturally, versions of GHC that can't compile Cabal 1.20.x; these *do* need
another override.
This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
This effectively reverts 86c283824f
("If cuda headers are presented to nix [...]") and all the following
workarounds that was added due to that commit.
As far as I can tell[1] this hack isn't needed anymore. And moving
includes to $out/usr_include causes pain for cudatoolkit users, so
better get rid of it.
In patches that did more than the $out/usr_include workaround, I only
changed the line back to $out/include instead of re-generating the
patches and fully removing the changed line.
[1]: I build tested blender and caffe, and temporarily added
recurseIntoAttrs to rPackages and haskellPackages so that nox-review
could get proper coverage. However, many of the packages do not build
even before this patch. I also built CUDA samples with cudatoolkit7
that ran fine.
