diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-07-26 13:46:04 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-07-26 13:46:04 -0400 |
| commit | 9be40841ea4251a09ae7a1023abc1b6d191f61bb (patch) | |
| tree | f45a3e2cc682740887b81517eca4bd4fecd6c1c2 /pkgs/development/python-modules/httpserver/default.nix | |
| parent | 8ce4780eff33591ed54b2fb97ca96108e4e7a740 (diff) | |
| parent | ac4c567c3603c5106862f144c21037f6ad76c0ad (diff) | |
Merge remote-tracking branch 'upstream/master' into staging-base
Conflicts:
pkgs/build-support/cc-wrapper/default.nix
pkgs/build-support/gcc-wrapper-old/builder.sh
pkgs/build-support/trivial-builders.nix
pkgs/desktops/kde-4.14/kde-package/default.nix
pkgs/development/compilers/openjdk-darwin/8.nix
pkgs/development/compilers/openjdk-darwin/default.nix
pkgs/development/compilers/openjdk/7.nix
pkgs/development/compilers/openjdk/8.nix
pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
pkgs/development/compilers/zulu/default.nix
pkgs/development/haskell-modules/generic-builder.nix
pkgs/misc/misc.nix
pkgs/stdenv/generic/builder.sh
pkgs/stdenv/generic/setup.sh
Diffstat (limited to 'pkgs/development/python-modules/httpserver/default.nix')
0 files changed, 0 insertions, 0 deletions