diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-09-11 10:49:13 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-09-11 10:49:13 +0000 |
| commit | 56314db0981148603cc4419641865c1f199d475e (patch) | |
| tree | b3a718260a07a6974b8124d757dd7bf890b9390f /pkgs/development/python-modules/rangehttpserver | |
| parent | 96cd1104b23ffb15d6c3ad012687882ea9c68155 (diff) | |
| parent | 22ed64101043d368b44c24f0d28e5c82ed5aa9bf (diff) | |
Merge remote-tracking branch 'nixpkgs/master' into staging-next
Conflicts:
pkgs/development/compilers/ghc/8.10.7.nix
pkgs/development/compilers/ghc/8.8.4.nix
I've removed the isWindows check from useLdGold in ghc, since that should
be covered by the new hasGold check.
Diffstat (limited to 'pkgs/development/python-modules/rangehttpserver')
0 files changed, 0 insertions, 0 deletions