schmittlauch/nixos-seafile-overlay
1
0
Fork 0
Code Issues 7 Pull requests Releases Wiki Activity

fix django-constance build and add licenses

Browse source
This commit is contained in:
Trolli Schmittlauch 2019-10-12 22:45:05 +02:00
parent 764edc371c
commit 9bcc347c83
2 changed files with 27 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
default.nix
View file

@ -6,5 +6,6 @@ self: super: rec {
django-jsonfield = super.python27Packages.callPackage ./django-jsonfield/default.nix {}; django-jsonfield = super.python27Packages.callPackage ./django-jsonfield/default.nix {};
jsonfield = super.python27Packages.callPackage ./jsonfield/default.nix {}; jsonfield = super.python27Packages.callPackage ./jsonfield/default.nix {};
django-post_office = super.python27Packages.callPackage ./django-post_office/default.nix { inherit jsonfield; }; django-post_office = super.python27Packages.callPackage ./django-post_office/default.nix { inherit jsonfield; };
django-statici18n = super.python27Packages.callPackage ./django-statici18n/default.nix {};
}; };
} }

29
seafile-server/default.nix
View file

@ -22,6 +22,11 @@
nativeBuildInputs = [ autoconf automake libtool pkgconfig vala autoreconfHook which ]; nativeBuildInputs = [ autoconf automake libtool pkgconfig vala autoreconfHook which ];
buildInputs = [ sqlite glib python27 libuuid openssl fuse libarchive ccnet-server libevent libsearpc libevhtp ]; buildInputs = [ sqlite glib python27 libuuid openssl fuse libarchive ccnet-server libevent libsearpc libevhtp ];
checkPhase = "bash ./run_tests.sh"; checkPhase = "bash ./run_tests.sh";
meta = with lib; {
license = licenses.agpl3; # with additional OpenSSL linking exception
maintainers = with maintainers; [ schmittlauch ];
};
}; };
seahub = python27Packages.buildPythonApplication rec { seahub = python27Packages.buildPythonApplication rec {
name = "seahub"; name = "seahub";
@ -33,25 +38,29 @@
#sha256 = "sha256:1aypbqrv30x9mmhiwcmkmzmac0mw0gx7cb1n4x90h46iqlbanhnq"; #sha256 = "sha256:1aypbqrv30x9mmhiwcmkmzmac0mw0gx7cb1n4x90h46iqlbanhnq";
sha256 = "sha256:19f9279zqkfy39gs1qfaj0m8asva5jgadh8f0yln8ln4khsrcnk8"; sha256 = "sha256:19f9279zqkfy39gs1qfaj0m8asva5jgadh8f0yln8ln4khsrcnk8";
}; };
phases = [ "installPhase" "fixupPhase" "distPhase" ]; phases = [ "unpackPhase" "fixupPhase" "distPhase" ];
installPhase = ''
find ./
'';
};
propagatedBuildInputs = with python27Packages; [ propagatedBuildInputs = with python27Packages; [
django pytz django-statici18n djangorestframework django_compressor django pytz django-statici18n djangorestframework django_compressor
django-post_office django-constance gunicorn flup chardet dateutil six django-post_office django-constance gunicorn flup chardet dateutil six
openpyxl openpyxl
]; ];
django-constance = python27.buildPythonPackage rec { meta = with lib; {
license = licenses.asl20;
maintainers = with maintainers; [ schmittlauch ];
};
};
django-constance = python27Packages.buildPythonPackage rec {
pname = "django-constance"; pname = "django-constance";
version = "1.0.1"; version = "1.0.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "haiwen"; owner = "haiwen";
repo = pname; repo = pname;
rev = "bde7f7c"; rev = "bde7f7c";
sha256 = "sha256:12ccqa3168n0s8mqgywbg87qk72yh9salqxafcq4nc4lc3mcsmxx"; sha256 = "sha256:0m5hhylsrs6bn7ma04615r1n7jwykyw8kmbw1xqrkgxs259lm77h";
}; };
propagatedBuildInputs = with python27Packages; [ django ];
checkInputs = [ python27Packages.redis python27Packages.coverage python27Packages.django-picklefield ];
doCheck = false; # figure that out later
meta = { meta = {
license = lib.licenses.bsd3; license = lib.licenses.bsd3;
}; };
@ -90,6 +99,10 @@
mkdir "$out" mkdir "$out"
cd "$out" cd "$out"
ln -s ${seahub} seahub ln -s ${seahub} seahub
ln -s ${seafile-server-core} seafile-core ln -s ${seafile-server-core} seaf-server
''; '';
meta = with lib; {
maintainers = with maintainers; [ schmittlauch ];
license = licenses.free; # components with different free software licenses are combined
};
} }