Revert "Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs""

Revert a revert of a merge that shouldn't have been in master but was intentionally in staging.

Next time I'll do this right after the revert instead of so far down the line...

This reverts commit 9adad8612b.
This commit is contained in:
Shea Levy
2016-08-24 07:35:30 -04:00
parent 78b7529ee3
commit 8b9b9fad31
13 changed files with 169 additions and 169 deletions

View File

@@ -1,3 +1,5 @@
# -*- coding: utf-8 -*-
import setuptools
import tokenize