Skip to content

Commit

Permalink
Source cleanup
Browse files Browse the repository at this point in the history
- Change license to BSD-3-clause
- Update to recent pypi2nix and nixpkgs 17.03
- Switch from buildout.cfg/versions.cfg to requirements.txt
- Remove some cruft
  • Loading branch information
Christian Kauhaus committed Aug 24, 2017
1 parent 64de189 commit 22c0037
Show file tree
Hide file tree
Showing 14 changed files with 625 additions and 734 deletions.
26 changes: 26 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
Copyright (c) 2017 Flying Circus Internet Operations GmbH. All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

1. Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.

2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

3. Neither the name of the copyright holder nor the names of its contributors
may be used to endorse or promote products derived from this software without
specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 changes: 0 additions & 26 deletions LICENSE.txt

This file was deleted.

36 changes: 0 additions & 36 deletions TODO

This file was deleted.

6 changes: 0 additions & 6 deletions bootstrap.sh

This file was deleted.

16 changes: 0 additions & 16 deletions buildout.cfg

This file was deleted.

12 changes: 8 additions & 4 deletions default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
{ pkgs ? import (builtins.fetchTarball "https://d3g5gsiof5omrk.cloudfront.net/nixos/16.09/nixos-16.09.1324.1dd0fb6/nixexprs.tar.xz") {}
}:
{ pkgs ? import <nixpkgs> { } }:

with pkgs.lib;

let
# generate requirements.nix with
# bin/pip freeze | egrep -v 'vulnix|pkg-resources' > requirements.txt
# pypi2nix -V 3.5 -E libxml2 -E libxslt -r requirements.txt
python = import ./requirements.nix { inherit pkgs; };
version = pkgs.lib.removeSuffix "\n" (builtins.readFile ./VERSION);

Expand All @@ -17,7 +21,7 @@ python.mkDerivation {
buildInputs = [
python.packages."flake8"
python.packages."pytest"
python.packages."pytest-capturelog"
python.packages."pytest-catchlog"
python.packages."pytest-codecheckers"
python.packages."pytest-cov"
python.packages."pytest-timeout"
Expand All @@ -42,6 +46,6 @@ python.mkDerivation {
meta = {
description = "NixOS vulnerability scanner";
homepage = https://github.com/flyingcircusio/vulnix;
license = pkgs.lib.licenses.bsd2;
license = pkgs.lib.licenses.bsd3;
};
}
Loading

0 comments on commit 22c0037

Please sign in to comment.