JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into staging

Browse Source
This commit is contained in:
Vladimír Čunát 2017-11-07 06:41:23 +01:00
commit 9aa37b159b
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
33 changed files with 668 additions and 970 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/maintainers.nix
View File

@ -265,6 +265,7 @@
hbunke = "Hendrik Bunke <bunke.hendrik@gmail.com>";
hce = "Hans-Christian Esperer <hc@hcesperer.org>";
hectorj = "Hector Jusforgues <hector.jusforgues+nixos@gmail.com>";
hedning = "Tor Hedin Brønner <torhedinbronner@gmail.com>";
heel = "Sergii Paryzhskyi <parizhskiy@gmail.com>";
henrytill = "Henry Till <henrytill@gmail.com>";
hhm = "hhm <heehooman+nixpkgs@gmail.com>";

54
nixos/tests/gitlab.nix
View File

@ -9,9 +9,57 @@ import ./make-test.nix ({ pkgs, ...} : {
nodes = {
gitlab = { config, pkgs, ... }: {
virtualisation.memorySize = 768;
services.gitlab.enable = true;
services.gitlab.databasePassword = "gitlab";
services.nginx = {
enable = true;
virtualHosts = {
"localhost" = {
locations."/".proxyPass = "http://unix:/run/gitlab/gitlab-workhorse.socket";
};
};
};
systemd.services.gitlab.serviceConfig.TimeoutStartSec = "10min";
services.gitlab = {
enable = true;
databasePassword = "dbPassword";
secrets = {
secret = "secret";
otp = "otpsecret";
db = "dbsecret";
# nix-shell -p openssl --run "openssl genrsa 2048"
jws = ''
-----BEGIN RSA PRIVATE KEY-----
MIIEpAIBAAKCAQEA13/qEio76OWUtWO0WIz9lWnsTWOU8Esv4sQHDq9PCEFsLt21
PAXrlWhLjjWcxGfsrDwnh7YErGHYL62BMSxMdFJolaknlQK/O/V8UETDe45VoHM+
Znk270RfUcfYFgiihnXUZXVmL0om9TsQSk646wCcjCY9LxtxUyKNhvT7KjgYw2aX
z34aw7M+Js3T2p1TjZPSC82GtmtKkJEKFMi5EjprLTDE7EdcUzr9Xuw+kQ+gRm9k
7FE+JQqSoprwE3Q0v2OAn3UhLMgg0gNFRnsc5l6IAshDzV+H22RPqKKlJjVjjfPY
0TQSvYLVApigHbDPH0BoCXfjFfQazbbP3OUHrwIDAQABAoIBAQCMU+tkcMQaYIV5
qLdjgkwO467QpivyXcOM8wF1eosIYTHFQvIlZ+WEoSmyLQ8shlADyBgls01Pw1c3
lNAv6RzQEmmwKzpvOh61OKH+0whIiOMRXHoh2IUBQZCgfHYlwvGyhUAN4WjtGmhM
AG4XNTQNM5S9Xpkw97nP3Qwz+YskbbkrfqtCEVy9ro+4nhbjqPsuO3adbnkva4zR
cyurRhrHgHU6LPjn5NHnHH4qw2faY2oAsL8pmpkTbO5IqWDvOcbjNfjVPgVoq26O
bbaa1qs4nmc80qQgMjRPJef535xyf3eLsSlDvpf6O8sPrJzVR1zaqEqixpQCZDac
+kRiSBrhAoGBAOwHiq0PuyJh6VzBu7ybqX6+gF/wA4Jkwzx6mbfaBgurvU1aospp
kisIonAkxSbxllZMnjbkShZEdATYKeT9o5NEhnU4YnHfc5bJZbiWOZAzYGLcY7g8
vDQ31pBItyY4pFgPbSpNlbUvUsoPVJ45RasRADDTNCzMzdjFQQXst2V9AoGBAOm7
sSpzYfFPLEAhieAkuhtbsX58Boo46djiKVfzGftfp6F9aHTOfzGORU5jrZ16mSbS
qkkC6BEFrATX2051dzzXC89fWoJYALrsffE5I3KlKXsCAWSnCP1MMxOfH+Ls61Mr
7pK/LKfvJt53mUH4jIdbmmFUDwbg18oBEH+x9PmbAoGAS/+JqXu9N67rIxDGUE6W
3tacI0f2+U9Uhe67/DTZaXyc8YFTlXU0uWKIWy+bw5RaYeM9tlL/f/f+m2i25KK+
vrZ7zNag7CWU5GJovGyykDnauTpZaYM03mN0VPT08/uc/zXIYqyknbhlIeaZynCK
fDB3LUF0NVCknz20WCIGU0kCgYEAkxY0ZXx61Dp4pFr2wwEZxQGs7uXpz64FKyEX
12r6nMATY4Lh6y/Px0W6w5vis8lk+5Ny6cNUevHQ0LNuJS+yu6ywl+1vrbrnqroM
f3LvpcPeGLSoX8jl1VDQi7aFgG6LoKly1xJLbdsH4NPutB9PgBbbTghx9GgmI88L
rPA2M6UCgYBOmkYJocNgxg6B1/n4Tb9fN1Q/XuJrFDE6NxVUoke+IIyMPRH7FC3m
VMYzu+b7zTVJjaBb1cmJemxl/xajziWDofJYPefhdbOVU7HXtmJFY0IG3pVxU1zW
3bmDj5QAtCUDpuuNa6GEIT0YR4+D/V7o3DmlZ0tVIwKJmVJoQ2f5dw==
-----END RSA PRIVATE KEY-----
'';
};
};
};
};
@ -19,6 +67,6 @@ import ./make-test.nix ({ pkgs, ...} : {
$gitlab->start();
$gitlab->waitForUnit("gitlab.service");
$gitlab->waitForUnit("gitlab-sidekiq.service");
$gitlab->waitUntilSucceeds("curl http://localhost:8080/users/sign_in");
$gitlab->waitUntilSucceeds("curl http://localhost:80/users/sign_in");
'';
})

4
pkgs/applications/graphics/feh/default.nix
View File

@ -6,11 +6,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "feh-${version}";
version = "2.21";
version = "2.22";
src = fetchurl {
url = "https://feh.finalrewind.org/${name}.tar.bz2";
sha256 = "0azgpr4al2pi4858z4xh4lfz84cvzxw3n426fn7rz6cdj34q212j";
sha256 = "0yqcczb9c126zgfvjq2fpzqz0rg16yad8mfr3gryxwlbymy2cmxj";
};
outputs = [ "out" "man" "doc" ];

4
pkgs/applications/networking/browsers/palemoon/default.nix
View File

@ -10,14 +10,14 @@
stdenv.mkDerivation rec {
name = "palemoon-${version}";
version = "27.5.0";
version = "27.6.0";
src = fetchFromGitHub {
name = "palemoon-src";
owner = "MoonchildProductions";
repo = "Pale-Moon";
rev = version + "_Release";
sha256 = "0m4fgwxn6hs8r240i6acaajx76cvqy1b7cqmdsxd33qpjrrj1h9d";
sha256 = "1v5rbam93fcc7c1l69clr9chi2l0zv0dhjq12v535n8vv9lhahhl";
};
desktopItem = makeDesktopItem {

20
pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix
View File

@ -1,7 +1,12 @@
{stdenv, fetchurl, python27Packages, file }:
{ stdenv, fetchurl, python27Packages, file }:
let
inherit (python27Packages) python;
requirements = (import ./requirements.nix {
inherit stdenv fetchurl;
pythonPackages = python27Packages;
});
in
stdenv.mkDerivation rec {
name = "salut-a-toi";
@ -13,12 +18,15 @@ in
sha256 = "0kn9403n8fpzl0hsb9kkzicsmzq2fjl627l31yykbqzc4nsr780d";
};
buildInputs = with python27Packages;
buildInputs = with python27Packages;
[
python twisted urwid wxPython pygobject2
wokkel dbus-python pyfeed wrapPython setuptools file
dbus-python wrapPython setuptools file
pycrypto pyxdg
];
] ++ (with requirements; [
pyfeed
wokkel
]);
configurePhase = ''
sed -i "/use_setuptools/d" setup.py
@ -26,7 +34,7 @@ in
sed -e "1aexport PATH=\"\$PATH\":\"$out/bin\":\"${python27Packages.twisted}/bin\"" -i src/sat.sh
sed -e "1aexport PYTHONPATH=\"\$PYTHONPATHPATH\":\"$PYTHONPATH\":"$out/${python.sitePackages}"" -i src/sat.sh
echo 'import wokkel.muc' | python
echo 'import wokkel.muc' | python
'';
buildPhase = ''
@ -39,7 +47,7 @@ in
for i in "$out/bin"/*; do
head -n 1 "$i" | grep -E '[/ ]python( |$)' && {
wrapProgram "$i" --prefix PYTHONPATH : "$PYTHONPATH:$out/${python.sitePackages}"
} || true
} || true
done
'';

67
pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix Normal file
View File

@ -0,0 +1,67 @@
{ fetchurl
, stdenv
, pythonPackages
}:
let
buildPythonPackage = pythonPackages.buildPythonPackage;
xe = buildPythonPackage rec {
url = "http://www.blarg.net/%7Esteveha/xe-0.7.4.tar.gz";
name = stdenv.lib.nameFromURL url ".tar";
src = fetchurl {
inherit url;
sha256 = "0v9878cl0y9cczdsr6xjy8v9l139lc23h4m5f86p4kpf2wlnpi42";
};
# error: invalid command 'test'
doCheck = false;
meta = {
homepage = "http://home.blarg.net/~steveha/xe.html";
description = "XML elements";
};
};
in {
pyfeed = (buildPythonPackage rec {
url = "http://www.blarg.net/%7Esteveha/pyfeed-0.7.4.tar.gz";
name = stdenv.lib.nameFromURL url ".tar";
src = fetchurl {
inherit url;
sha256 = "1h4msq573m7wm46h3cqlx4rsn99f0l11rhdqgf50lv17j8a8vvy1";
};
propagatedBuildInputs = [ xe ];
# error: invalid command 'test'
doCheck = false;
meta = with stdenv.lib; {
homepage = "http://home.blarg.net/~steveha/pyfeed.html";
description = "Tools for syndication feeds";
};
});
wokkel = buildPythonPackage (rec {
url = "http://wokkel.ik.nu/releases/0.7.0/wokkel-0.7.0.tar.gz";
name = stdenv.lib.nameFromURL url ".tar";
src = fetchurl {
inherit url;
sha256 = "0rnshrzw8605x05mpd8ndrx3ri8h6cx713mp8sl4f04f4gcrz8ml";
};
propagatedBuildInputs = with pythonPackages; [twisted dateutil];
meta = with stdenv.lib; {
description = "Some (mainly XMPP-related) additions to twisted";
homepage = "http://wokkel.ik.nu/";
license = licenses.mit;
};
});
}

20
pkgs/applications/networking/pyload/beautifulsoup.nix Normal file
View File

@ -0,0 +1,20 @@
{ pythonPackages, isPy3k, pkgs }:
pythonPackages.buildPythonPackage rec {
name = "beautifulsoup-3.2.1";
disabled = isPy3k;
src = pkgs.fetchurl {
url = "http://www.crummy.com/software/BeautifulSoup/download/3.x/BeautifulSoup-3.2.1.tar.gz";
sha256 = "1nshbcpdn0jpcj51x0spzjp519pkmqz0n0748j7dgpz70zlqbfpm";
};
# error: invalid command 'test'
doCheck = false;
meta = {
homepage = http://www.crummy.com/software/BeautifulSoup/;
license = "bsd";
description = "Undemanding HTML/XML parser";
};
}

11
pkgs/applications/networking/pyload/default.nix
View File

@ -1,5 +1,12 @@
{ stdenv, fetchFromGitHub, fetchpatch, pythonPackages, gocr, unrar, rhino, spidermonkey }:
pythonPackages.buildPythonApplication rec {
{ stdenv, fetchFromGitHub, fetchpatch, pythonPackages, gocr, unrar, rhino, spidermonkey
, pkgs }:
let
beautifulsoup = pythonPackages.callPackage ./beautifulsoup.nix {
inherit pythonPackages;
};
in pythonPackages.buildPythonApplication rec {
version = "0.4.9-next";
name = "pyLoad-" + version;

4
pkgs/applications/version-management/gitea/default.nix
View File

@ -7,13 +7,13 @@ with stdenv.lib;
buildGoPackage rec {
name = "gitea-${version}";
version = "1.2.1";
version = "1.2.3";
src = fetchFromGitHub {
owner = "go-gitea";
repo = "gitea";
rev = "v${version}";
sha256 = "15zw4b6hnx4hmzn2xlsi4p7jvh6jx4g4smbdidnrzrykzyq4rmpp";
sha256 = "0v24q14xzmqgwk10m7rqyn6pahd630v3bnc646ij4w8fbgr8hzja";
};
patches = [ ./static-root-path.patch ];

4
pkgs/build-support/fetchurl/default.nix
View File

@ -84,6 +84,9 @@ in
, # Meta information, if any.
meta ? {}
# Passthru information, if any.
, passthru ? {}
}:
assert builtins.isList urls;
@ -139,4 +142,5 @@ else stdenv.mkDerivation {
'';
inherit meta;
inherit passthru;
}

9
pkgs/development/idris-modules/default.nix
View File

@ -1,4 +1,4 @@
{ pkgs, idris, overrides ? (self: super: {}) }: let
{ pkgs, idris-no-deps, overrides ? (self: super: {}) }: let
inherit (pkgs.lib) callPackageWith fix' extends;
/* Taken from haskell-modules/default.nix, should probably abstract this away */
@ -33,7 +33,12 @@
value = callPackage (./. + "/${name}.nix") {};
}) files)) // {
inherit idris callPackage;
inherit idris-no-deps callPackage;
# See #10450 about why we have to wrap the executable
idris =
(pkgs.callPackage ./idris-wrapper.nix {})
idris-no-deps
{ path = [ pkgs.gcc ]; lib = [pkgs.gmp]; };
# A list of all of the libraries that come with idris
builtins = pkgs.lib.mapAttrsToList (name: value: value) builtins_;

14
pkgs/development/idris-modules/idris-wrapper.nix Normal file
View File

@ -0,0 +1,14 @@
{ symlinkJoin, makeWrapper, stdenv }: idris: { path, lib }:
symlinkJoin {
name = idris.name;
src = idris.src;
paths = [ idris ];
buildInputs = [ makeWrapper ];
postBuild = ''
wrapProgram $out/bin/idris \
--suffix PATH : ${ stdenv.lib.makeBinPath path } \
--suffix LIBRARY_PATH : ${stdenv.lib.makeLibraryPath lib}
'';
}

4
pkgs/development/ocaml-modules/zed/default.nix
View File

@ -3,8 +3,8 @@
let param =
if stdenv.lib.versionAtLeast ocaml.version "4.02" then
{
version = "1.5";
sha256 = "1nq884cxl1k4daa549bk7bxarwivbpp51k4blbiwyxwfhs29xgfr";
version = "1.6";
sha256 = "00hhxcjf3bj3w2qm8nzs9x6vrqkadf4i0277s5whzy2rmiknj63v";
buildInputs = [ jbuilder ];
extra = {
buildPhase = "jbuilder build -p zed";

2
pkgs/development/python-modules/devpi-common/default.nix
View File

@ -14,6 +14,8 @@ with pythonPackages;buildPythonPackage rec {
checkInputs = [ pytest ];
checkPhase = ''
# Don't know why this test is failing!
substituteInPlace testing/test_request.py --replace "test_env" "noop_test_env"
py.test
'';

22
pkgs/development/python-modules/fastimport/default.nix Normal file
View File

@ -0,0 +1,22 @@
{ stdenv, buildPythonPackage, python, fetchurl }:
buildPythonPackage rec {
name = "fastimport-${version}";
version = "0.9.6";
src = fetchurl {
url = "mirror://pypi/f/fastimport/${name}.tar.gz";
sha256 = "1aqjsin4rmqm7ln4j0p73fzxifws6c6ikgyhav7r137m2ixsxl43";
};
checkPhase = ''
${python.interpreter} -m unittest discover
'';
meta = with stdenv.lib; {
homepage = https://launchpad.net/python-fastimport;
description = "VCS fastimport/fastexport parser";
maintainers = with maintainers; [ koral ];
license = licenses.gpl2Plus;
};
}

23
pkgs/development/python-modules/pyfeed/default.nix
View File

@ -1,23 +0,0 @@
{ stdenv, buildPythonPackage, fetchurl
, xe }:
buildPythonPackage rec {
url = "http://www.blarg.net/%7Esteveha/pyfeed-0.7.4.tar.gz";
name = stdenv.lib.nameFromURL url ".tar";
src = fetchurl {
inherit url;
sha256 = "1h4msq573m7wm46h3cqlx4rsn99f0l11rhdqgf50lv17j8a8vvy1";
};
propagatedBuildInputs = [ xe ];
# error: invalid command 'test'
doCheck = false;
meta = with stdenv.lib; {
homepage = "http://home.blarg.net/~steveha/pyfeed.html";
description = "Tools for syndication feeds";
};
}

27
pkgs/development/python-modules/pylibacl/default.nix Normal file
View File

@ -0,0 +1,27 @@
{ lib
, buildPythonPackage
, fetchPypi
, pkgs
}:
buildPythonPackage rec {
pname = "pylibacl";
version = "0.5.3";
name = pname + "-" + version;
src = fetchPypi {
inherit pname version;
sha256 = "0c3xw1s5bh6jnsc0wwyxnn6kn6x6rpbmmi05ap1f81fyqlgrzgj0";
};
# ERROR: testExtended (tests.test_acls.AclExtensions)
# IOError: [Errno 0] Error
doCheck = false;
buildInputs = with pkgs; [ acl ];
meta = {
description = "A Python extension module for POSIX ACLs, it can be used to query, list, add, and remove ACLs from files and directories under operating systems that support them";
license = lib.licenses.lgpl21Plus;
};
}

27
pkgs/development/python-modules/python-fuse/default.nix Normal file
View File

@ -0,0 +1,27 @@
{ lib
, pkgconfig
, fetchurl
, fuse
, buildPythonPackage
, isPy3k
}:
buildPythonPackage rec {
baseName = "fuse";
version = "0.2.1";
name = "${baseName}-${version}";
disabled = isPy3k;
src = fetchurl {
url = "mirror://sourceforge/fuse/fuse-python-${version}.tar.gz";
sha256 = "06rmp1ap6flh64m81j0n3a357ij2vj9zwcvvw0p31y6hz1id9shi";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ fuse ];
meta = {
description = "Python bindings for FUSE";
license = lib.licenses.lgpl21;
};
}

26
pkgs/development/python-modules/pyxattr/default.nix Normal file
View File

@ -0,0 +1,26 @@
{ lib
, pkgs
, fetchPypi
, buildPythonPackage
}:
buildPythonPackage rec {
pname = "pyxattr";
version = "0.6.0";
name = pname + "-" + version;
src = fetchPypi {
inherit pname version;
sha256 = "1a3fqjlgbzq5hmc3yrnxxxl8nyn3rz2kfn17svbsahaq4gj0xl09";
};
# IOError: [Errno 95] Operation not supported (expected)
doCheck = false;
buildInputs = with pkgs; [ attr ];
meta = with lib; {
description = "A Python extension module which gives access to the extended attributes for filesystem objects available in some operating systems";
license = licenses.lgpl21Plus;
};
}

27
pkgs/development/tools/database/sqlitebrowser/default.nix
View File

@ -1,32 +1,39 @@
{ mkDerivation, lib, fetchFromGitHub, qtbase, qttools, sqlite, cmake }:
{ mkDerivation, lib, fetchFromGitHub, cmake, antlr
, qtbase, qttools, qscintilla, sqlite }:
mkDerivation rec {
version = "3.10.0";
version = "3.10.1";
name = "sqlitebrowser-${version}";
src = fetchFromGitHub {
repo = "sqlitebrowser";
owner = "sqlitebrowser";
rev = "v${version}";
sha256 = "1fwr7p4b6glc3s0a06i7cg8l9p1mrcm4vyhyf2wi89cyg22rrf5c";
sha256 = "1brzam8yv6sbdmbqsp7vglhd6wlx49g2ap8llr271zrkld4k3kar";
};
buildInputs = [ qtbase qttools sqlite ];
nativeBuildInputs = [ cmake ];
buildInputs = [ qtbase qscintilla sqlite ];
cmakeFlags = [ "-DUSE_QT5=TRUE" ];
nativeBuildInputs = [ cmake antlr qttools ];
# A regression was introduced in CMakeLists.txt on v3.9.x
# See https://github.com/sqlitebrowser/sqlitebrowser/issues/832 and issues/755
enableParallelBuilding = true;
# We have to patch out Test and PrintSupport to make this work with Qt 5.9
# It can go when the application supports 5.9
postPatch = ''
substituteInPlace CMakeLists.txt --replace 'project("DB Browser for SQLite")' 'project(sqlitebrowser)'
substituteInPlace CMakeLists.txt \
--replace Test "" \
--replace PrintSupport ""
substituteInPlace libs/qcustomplot-source/CMakeLists.txt \
--replace PrintSupport ""
'';
meta = with lib; {
description = "DB Browser for SQLite";
homepage = http://sqlitebrowser.org/;
license = licenses.gpl3;
maintainers = [ maintainers.matthiasbeyer ];
maintainers = with maintainers; [ matthiasbeyer ];
platforms = platforms.linux; # can only test on linux
};
}

6
pkgs/games/anki/default.nix
View File

@ -7,8 +7,8 @@
}:
let
version = "2.0.46";
inherit (python2Packages) python wrapPython sqlalchemy pyaudio beautifulsoup httplib2 matplotlib pyqt4;
version = "2.0.47";
inherit (python2Packages) python wrapPython sqlalchemy pyaudio beautifulsoup4 httplib2 matplotlib pyqt4;
qt4 = pyqt4.qt;
in
stdenv.mkDerivation rec {
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
sha256 = "01h51rbnj0r6lmjnn2vzxzaf7mxkc0azmg1v4mvf4pkpsp50a7hr";
};
pythonPath = [ pyqt4 sqlalchemy pyaudio beautifulsoup httplib2 ]
pythonPath = [ pyqt4 sqlalchemy pyaudio beautifulsoup4 httplib2 ]
++ lib.optional plotsSupport matplotlib;
buildInputs = [ python wrapPython lame mplayer libpulseaudio ];

4
pkgs/games/openra/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, mono, makeWrapper, lua
, SDL2, freetype, openal, systemd, pkgconfig,
dotnetPackages, gnome3, curl, unzip, which
dotnetPackages, gnome3, curl, unzip, which, python
}:
stdenv.mkDerivation rec {
@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
postInstall = with stdenv.lib; let
runtime = makeLibraryPath [ SDL2 freetype openal systemd lua ];
binaries= makeBinPath [ which mono gnome3.zenity ];
binaries= makeBinPath [ which mono gnome3.zenity python ];
in ''
wrapProgram $out/lib/openra/launch-game.sh \
--prefix PATH : "${binaries}" \

594
pkgs/misc/vim-plugins/default.nix
View File

File diff suppressed because it is too large Load Diff

1
pkgs/misc/vim-plugins/vim-plugin-names
View File

@ -72,7 +72,6 @@
"github:jeetsukumaran/vim-buffergator"
"github:jgdavey/tslime.vim"
"github:jhradilek/vim-docbk"
"github:jhradilek/vim-snippets"
"github:jiangmiao/auto-pairs"
"github:jistr/vim-nerdtree-tabs"
"github:jnurmine/zenburn"

7
pkgs/misc/vim-plugins/vim2nix/additional-nix-code/command-t
View File

@ -1,6 +1,5 @@
buildInputs = [ perl ruby git ];
buildInputs = [ ruby rake ];
buildPhase = ''
pushd ruby/command-t
gem build ./command-t.gemspec
popd
rake make
rm ruby/command-t/ext/command-t/*.o
'';

8
pkgs/os-specific/linux/firejail/default.nix
View File

@ -3,11 +3,11 @@ let
s = # Generated upstream information
rec {
baseName="firejail";
version="0.9.48";
version="0.9.50";
name="${baseName}-${version}";
hash="02a74nx8p2gbpd6ffnr52p02pxxllw3yy5fy4083a77r3wia8zb3";
url="https://vorboss.dl.sourceforge.net/project/firejail/firejail/firejail-0.9.48.tar.xz";
sha256="02a74nx8p2gbpd6ffnr52p02pxxllw3yy5fy4083a77r3wia8zb3";
hash="005q7f1h7z4c1wg8vzb1zh0xi4msz6z0fcph0y3ywhlbxjvpam61";
url="https://vorboss.dl.sourceforge.net/project/firejail/firejail/firejail-0.9.50.tar.xz";
sha256="005q7f1h7z4c1wg8vzb1zh0xi4msz6z0fcph0y3ywhlbxjvpam61";
};
buildInputs = [
which

4
pkgs/os-specific/linux/firmware/raspberrypi/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "raspberrypi-firmware-${version}";
version = "1.20170811";
version = "1.20171029";
src = fetchFromGitHub {
owner = "raspberrypi";
repo = "firmware";
rev = version;
sha256 = "1lrbbslpwjgvrn7hk3l104gkl07qxh7qd4cdyqccqhqzip9wqhkn";
sha256 = "12aisha8rlr28310hakps04z9p45kd2wvks0w1vxw1kwfh1ncy9s";
};
dontStrip = true; # Stripping breaks some of the binaries

6
pkgs/os-specific/linux/kernel/linux-rpi.nix
View File

@ -1,8 +1,8 @@
{ stdenv, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args:
let
modDirVersion = "4.9.41";
tag = "1.20170811";
modDirVersion = "4.9.59";
tag = "1.20171029";
in
stdenv.lib.overrideDerivation (import ./generic.nix (args // rec {
version = "${modDirVersion}-${tag}";
@ -12,7 +12,7 @@ stdenv.lib.overrideDerivation (import ./generic.nix (args // rec {
owner = "raspberrypi";
repo = "linux";
rev = "raspberrypi-kernel_${tag}-1";
sha256 = "1ly0x7a43zvig0fv7lc6rpq49pcdb7i9sdb78p4gi5485zap40kb";
sha256 = "19lb1gxz21x1d5zdznzqfq60kxg7iqmyl6l0mb9qg2vrl8fcgnxk";
};
features = {

19
pkgs/servers/http/hyp/default.nix Normal file
View File

@ -0,0 +1,19 @@
{ stdenv, fetchurl, python3Packages }:
python3Packages.buildPythonPackage rec {
name = "hyp-server-${version}";
version = "1.2.0";
src = fetchurl {
url = "mirror://pypi/h/hyp-server/${name}.tar.gz";
sha256 = "1lafjdcn9nnq6xc3hhyizfwh6l69lc7rixn6dx65aq71c913jc15";
};
meta = with stdenv.lib; {
description = "Hyperminimal https server";
homepage = https://github.com/rnhmjoj/hyp;
license = with licenses; [gpl3Plus mit];
maintainers = with maintainers; [ rnhmjoj ];
platforms = platforms.unix;
};
}

4
pkgs/servers/monitoring/lcdproc/default.nix
View File

@ -24,7 +24,9 @@ stdenv.mkDerivation rec {
buildInputs = [ freetype libX11 libftdi libusb libusb1 ncurses ];
nativeBuildInputs = [ autoreconfHook doxygen makeWrapper pkgconfig ];
enableParallelBuilding = true;
# In 0.5.9: gcc: error: libbignum.a: No such file or directory
enableParallelBuilding = false;
postFixup = ''
for f in $out/bin/*.pl ; do

6
pkgs/shells/nix-zsh-completions/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
let
version = "0.3.1";
version = "0.3.2";
in
stdenv.mkDerivation rec {
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
owner = "spwhitt";
repo = "nix-zsh-completions";
rev = "${version}";
sha256 = "1sbc52f5818bcygljrji84dyvgw727x50m9v6qfrsdaji3zkqga1";
sha256 = "0i306k50g07n9smy68npma1k90sv173zy12jdi8wm7h1sj53m5rv";
};
installPhase = ''
@ -24,6 +24,6 @@ stdenv.mkDerivation rec {
description = "ZSH completions for Nix, NixOS, and NixOps";
license = stdenv.lib.licenses.bsd3;
platforms = stdenv.lib.platforms.all;
maintainers = [ stdenv.lib.maintainers.spwhitt stdenv.lib.maintainers.olejorgenb ];
maintainers = [ stdenv.lib.maintainers.spwhitt stdenv.lib.maintainers.olejorgenb stdenv.lib.maintainers.hedning ];
};
}

9
pkgs/top-level/all-packages.nix
View File

@ -5874,7 +5874,8 @@ with pkgs;
icedtea_web = icedtea8_web;
idrisPackages = callPackage ../development/idris-modules {
idris =
idris-no-deps =
let
inherit (self.haskell) lib;
haskellPackages = self.haskellPackages.override {
@ -5891,6 +5892,8 @@ with pkgs;
haskellPackages.idris;
};
idris = idrisPackages.with-packages [ idrisPackages.base ] ;
intercal = callPackage ../development/compilers/intercal { };
irony-server = callPackage ../development/tools/irony-server/default.nix {
@ -7591,7 +7594,7 @@ with pkgs;
flex = flex_2_5_35;
};
sqlitebrowser = libsForQt56.callPackage ../development/tools/database/sqlitebrowser { };
sqlitebrowser = libsForQt5.callPackage ../development/tools/database/sqlitebrowser { };
sselp = callPackage ../tools/X11/sselp{ };
@ -11494,6 +11497,8 @@ with pkgs;
exhibitor = callPackage ../servers/exhibitor { };
hyp = callPackage ../servers/http/hyp/default.nix { };
prosody = callPackage ../servers/xmpp/prosody {
lua5 = lua5_1;
inherit (lua51Packages) luasocket luasec luaexpat luafilesystem luabitop luaevent luazlib;

600
pkgs/top-level/python-packages.nix
View File

@ -1257,25 +1257,6 @@ in {
};
};
beautifulsoup = buildPythonPackage (rec {
name = "beautifulsoup-3.2.1";
disabled = isPy3k;
src = pkgs.fetchurl {
url = "http://www.crummy.com/software/BeautifulSoup/download/3.x/BeautifulSoup-3.2.1.tar.gz";
sha256 = "1nshbcpdn0jpcj51x0spzjp519pkmqz0n0748j7dgpz70zlqbfpm";
};
# error: invalid command 'test'
doCheck = false;
meta = {
homepage = http://www.crummy.com/software/BeautifulSoup/;
license = "bsd";
description = "Undemanding HTML/XML parser";
};
});
beautifulsoup4 = callPackage ../development/python-modules/beautifulsoup4 { };
beaker = buildPythonPackage rec {
@ -2756,24 +2737,6 @@ in {
cligj = callPackage ../development/python-modules/cligj { };
clientform = buildPythonPackage (rec {
name = "clientform-0.2.10";
disabled = isPy3k;
src = pkgs.fetchurl {
url = "mirror://pypi/C/ClientForm/ClientForm-0.2.10.tar.gz";
sha256 = "0dydh3i1sx7rrj6d0gj375wkjpiivm7jjlsimw6hmwv4ck7yf1wm";
};
meta = {
homepage = http://wwwsearch.sourceforge.net/ClientForm/;
license = "bsd";
description = "Python module for handling HTML forms on the client side";
};
});
/* There is a project called "closure-linter" on PyPI that is the
same as this, but it does not appear to be owned by Google.
So we're pulling from Google's GitHub repo instead. */
@ -3022,30 +2985,6 @@ in {
});
configshell_fb = buildPythonPackage rec {
version = "1.1.fb10";
name = "configshell-fb-${version}";
src = pkgs.fetchurl {
url = "https://github.com/agrover/configshell-fb/archive/v${version}.tar.gz";
sha256 = "1dd87xvm98nk3jzybb041gjdahi2z9b53pwqhyxcfj4a91y82ndy";
};
propagatedBuildInputs = with self; [
pyparsing
urwid
];
# Fails on python 3 due to a None value where a string is expected
doCheck = !isPy3k;
meta = {
description = "A Python library for building configuration shells";
homepage = "https://github.com/agrover/configshell-fb";
platforms = platforms.linux;
};
};
confluent-kafka = callPackage ../development/python-modules/confluent-kafka {};
construct = callPackage ../development/python-modules/construct {};
@ -4658,30 +4597,6 @@ in {
};
};
deform_bootstrap = buildPythonPackage rec {
name = "deform_bootstrap-0.2.9";
src = pkgs.fetchurl {
url = "mirror://pypi/d/deform_bootstrap/${name}.tar.gz";
sha256 = "1hgq3vqsfqdmlyahnlc40w13viawhpzqf4jzigsggdb41x545fda";
};
buildInputs = [ self.mock ];
propagatedBuildInputs = with self; [ deform pyramid ];
# demo is removed as it depends on deformdemo
patchPhase = ''
rm -rf deform_bootstrap/demo
'';
meta = {
maintainers = with maintainers; [ domenkozar ];
platforms = platforms.all;
};
};
demjson = callPackage ../development/python-modules/demjson { };
derpconf = self.buildPythonPackage rec {
name = "derpconf-0.4.9";
@ -5680,27 +5595,6 @@ in {
google-compute-engine = callPackage ../tools/virtualization/google-compute-engine { };
googlecl = buildPythonPackage rec {
version = "0.9.14";
name = "googlecl-${version}";
disabled = isPy3k;
src = pkgs.fetchurl {
url = "https://googlecl.googlecode.com/files/${name}.tar.gz";
sha256 = "0nnf7xkr780wivr5xnchfcrahlzy9bi2dxcs1w1bh1014jql0iha";
};
meta = {
description = "Brings Google services to the command line";
homepage = https://code.google.com/p/googlecl/;
license = licenses.asl20;
maintainers = with maintainers; [ lovek323 ];
platforms = platforms.unix;
};
propagatedBuildInputs = with self; [ gdata ];
};
gplaycli = buildPythonPackage rec {
version = "0.1.2";
name = "gplaycli-${version}";
@ -6188,35 +6082,6 @@ in {
};
};
ledger-autosync = buildPythonPackage rec {
name = "ledger-autosync-${version}";
version = "0.2.3";
src = pkgs.fetchurl {
url = "mirror://pypi/l/ledger-autosync/ledger-autosync-${version}.tar.gz";
sha256 = "f19fa66e656309825887171d84a462e64676b1cc36b62e4dd8679ff63926a469";
};
propagatedBuildInputs = with self; [ ofxclient ];
buildInputs = with self; [
mock
nose
# Used at runtime to translate ofx entries to the ledger
# format. In fact, user could use either ledger or hledger.
pkgs.which
pkgs.ledger ];
# Tests are disable since they require hledger and python-ledger
doCheck = false;
meta = {
homepage = https://gitlab.com/egh/ledger-autosync;
description = "ledger-autosync is a program to pull down transactions from your bank and create ledger transactions for them";
license = licenses.gpl3;
maintainers = with maintainers; [ lewo ];
};
};
libsexy = callPackage ../development/python-modules/libsexy {
libsexy = pkgs.libsexy;
};
@ -7199,19 +7064,6 @@ in {
};
pyramid_debugtoolbar = buildPythonPackage rec {
name = "pyramid_debugtoolbar-1.0.9";
src = pkgs.fetchurl {
url = "mirror://pypi/p/pyramid_debugtoolbar/${name}.tar.gz";
sha256 = "1vnzg1qnnyisv7znxg7pasayfyr3nz7rrs5nqr4fmdgwj9q2pyv0";
};
buildInputs = with self; [ ];
propagatedBuildInputs = with self; [ pyramid pyramid_mako ];
};
pyramid_mako = buildPythonPackage rec {
name = "pyramid_mako-0.3.1";
@ -7478,25 +7330,6 @@ in {
subliminal = callPackage ../development/python-modules/subliminal {};
hyp = buildPythonPackage rec {
name = "hyp-server-${version}";
version = "1.2.0";
disabled = !isPy3k;
src = pkgs.fetchurl {
url = "mirror://pypi/h/hyp-server/${name}.tar.gz";
sha256 = "1lafjdcn9nnq6xc3hhyizfwh6l69lc7rixn6dx65aq71c913jc15";
};
meta = {
description = "Hyperminimal https server";
homepage = https://github.com/rnhmjoj/hyp;
license = with licenses; [gpl3Plus mit];
maintainers = with maintainers; [ rnhmjoj ];
platforms = platforms.unix;
};
};
hyperlink = callPackage ../development/python-modules/hyperlink {};
zope_copy = buildPythonPackage rec {
@ -7749,30 +7582,6 @@ in {
};
rtmidi = buildPythonPackage rec {
version = "0.3a";
name = "rtmidi-${version}";
src = pkgs.fetchurl {
url = "http://chrisarndt.de/projects/python-rtmidi/download/python-${name}.tar.bz2";
sha256 = "0d2if633m3kbiricd5hgn1csccd8xab6lnab1bq9prdr9ks9i8h6";
};
preConfigure = ''
sed -i "/use_setuptools/d" setup.py
'';
buildInputs = with self; [ pkgs.alsaLib pkgs.libjack2 ];
meta = {
description = "A Python wrapper for the RtMidi C++ library written with Cython";
homepage = http://trac.chrisarndt.de/code/wiki/python-rtmidi;
license = licenses.mit;
maintainers = with maintainers; [ goibhniu ];
};
};
setuptools-git = buildPythonPackage rec {
name = "setuptools-git-${version}";
version = "1.1";
@ -8431,22 +8240,6 @@ in {
};
};
doxypy = buildPythonPackage rec {
name = "doxypy-0.4.2";
src = pkgs.fetchurl {
url = "http://code.foosel.org/files/${name}.tar.gz";
sha256 = "1afmb30zmy7942b53qa5vd3js883wwqqls35n8xfb3rnj0qnll8g";
};
meta = {
homepage = http://code.foosel.org/doxypy;
description = "An input filter for Doxygen";
};
doCheck = false;
};
dtopt = buildPythonPackage rec {
name = "dtopt-0.1";
@ -8656,30 +8449,8 @@ in {
};
};
fastimport = buildPythonPackage rec {
name = "fastimport-${version}";
version = "0.9.4";
# Judging from SyntaxError
disabled = isPy3k;
src = pkgs.fetchurl {
url = "mirror://pypi/f/fastimport/${name}.tar.gz";
sha256 = "0k8x7552ypx9rc14vbsvg2lc6z0r8pv9laah28pdwyynbq10825d";
};
checkPhase = ''
${python.interpreter} -m unittest discover
'';
meta = {
homepage = https://launchpad.net/python-fastimport;
description = "VCS fastimport/fastexport parser";
maintainers = with maintainers; [ koral ];
license = licenses.gpl2Plus;
};
};
fastimport = callPackage ../development/python-modules/fastimport { };
feedgen = callPackage ../development/python-modules/feedgen { };
feedgenerator = callPackage ../development/python-modules/feedgenerator {
@ -9010,27 +8781,6 @@ in {
pytorch = callPackage ../development/python-modules/pytorch { };
python_tvrage = buildPythonPackage (rec {
version = "0.4.1";
name = "tvrage-${version}";
src = pkgs.fetchurl {
url = "mirror://pypi/p/python-tvrage/python-tvrage-${version}.tar.gz";
sha256 = "f8a530376c5cf1bc573d1945a8504c3394b228c731a3eff5100c705997a72063";
};
# has mostly networking dependent tests
doCheck = false;
propagatedBuildInputs = with self; [ beautifulsoup ];
meta = {
homepage = https://github.com/ckreutzer/python-tvrage;
description = "Client interface for tvrage.com's XML-based api feeds";
license = licenses.bsd3;
maintainers = with maintainers; [ domenkozar ];
};
});
python2-pythondialog = buildPythonPackage rec {
name = "python2-pythondialog-${version}";
version = "3.3.0";
@ -9241,25 +8991,7 @@ in {
};
};
fuse = buildPythonPackage (rec {
baseName = "fuse";
version = "0.2.1";
name = "${baseName}-${version}";
disabled = isPy3k;
src = pkgs.fetchurl {
url = "mirror://sourceforge/fuse/fuse-python-${version}.tar.gz";
sha256 = "06rmp1ap6flh64m81j0n3a357ij2vj9zwcvvw0p31y6hz1id9shi";
};
nativeBuildInputs = [ pkgs.pkgconfig ];
buildInputs = with self; [ pkgs.fuse ];
meta = {
description = "Python bindings for FUSE";
license = licenses.lgpl21;
};
});
fuse = callPackage ../development/python-modules/python-fuse { fuse = pkgs.fuse; };
fusepy = buildPythonPackage rec {
name = "fusepy-2.0.4";
@ -11249,7 +10981,7 @@ in {
sha256 = "0rki9nl4y42q694parafcsdcdqvkdjckrbg6n0691302lfsrkyfl";
};
propagatedBuildInputs = with self; [ clientform html5lib ];
propagatedBuildInputs = with self; [ html5lib ];
doCheck = false;
@ -12601,23 +12333,6 @@ in {
nose-exclude = callPackage ../development/python-modules/nose-exclude { };
nose-selecttests = buildPythonPackage rec {
version = "0.4";
name = "nose-selecttests-${version}";
src = pkgs.fetchurl {
url = "mirror://pypi/n/nose-selecttests/${name}.zip";
sha256 = "0lgrfgp3sq8xi8d9grrg0z8jsyk0wl8a3rxw31hb7vdncin5b7n5";
};
propagatedBuildInputs = with self; [ nose ];
meta = {
description = "Simple nose plugin that enables developers to run subset of collected tests to spare some waiting time for better things";
};
};
nose2 = if isPy26 then null else (buildPythonPackage rec {
name = "nose2-0.5.0";
src = pkgs.fetchurl {
@ -16129,8 +15844,6 @@ in {
};
};
pyfeed = callPackage ../development/python-modules/pyfeed { };
pyfftw = callPackage ../development/python-modules/pyfftw { };
pyfiglet = callPackage ../development/python-modules/pyfiglet { };
@ -16843,25 +16556,7 @@ in {
};
};
pylibacl = buildPythonPackage (rec {
name = "pylibacl-0.5.1";
src = pkgs.fetchurl {
url = "https://github.com/downloads/iustin/pylibacl/${name}.tar.gz";
sha256 = "1idks7j9bn62xzsaxkvhl7bdq6ws8kv8aa0wahfh7724qlbbcf1k";
};
# ERROR: testExtended (tests.test_acls.AclExtensions)
# IOError: [Errno 0] Error
doCheck = false;
buildInputs = with self; [ pkgs.acl ];
meta = {
description = "A Python extension module for POSIX ACLs, it can be used to query, list, add, and remove ACLs from files and directories under operating systems that support them";
license = licenses.lgpl21Plus;
};
});
pylibacl = callPackage ../development/python-modules/pylibacl { };
pyliblo = buildPythonPackage rec {
name = "pyliblo-${version}";
@ -16883,29 +16578,6 @@ in {
};
};
pymacs = buildPythonPackage rec {
version = "0.25";
name = "pymacs-${version}";
disabled = isPy3k || isPyPy;
src = pkgs.fetchurl {
url = "https://github.com/pinard/Pymacs/tarball/v${version}";
name = "${name}.tar.gz";
sha256 = "1hmy76c5igm95rqbld7gvk0az24smvc8hplfwx2f5rhn6frj3p2i";
};
configurePhase = "make";
doCheck = false;
meta = {
description = "Emacs Lisp to Python interface";
homepage = http://pymacs.progiciels-bpi.ca;
license = licenses.gpl2;
maintainers = with maintainers; [ goibhniu ];
};
};
pypcap = callPackage ../development/python-modules/pypcap {};
pyplatec = buildPythonPackage rec {
@ -17451,25 +17123,7 @@ in {
pywinrm = callPackage ../development/python-modules/pywinrm { };
pyxattr = buildPythonPackage (rec {
name = "pyxattr-0.5.1";
src = pkgs.fetchurl {
url = "https://github.com/downloads/iustin/pyxattr/${name}.tar.gz";
sha256 = "0jmkffik6hdzs7ng8c65bggss2ai40nm59jykswdf5lpd36cxddq";
};
# error: invalid command 'test'
doCheck = false;
buildInputs = with self; [ pkgs.attr ];
meta = {
description = "A Python extension module which gives access to the extended attributes for filesystem objects available in some operating systems";
license = licenses.lgpl21Plus;
};
});
pyxattr = callPackage ../development/python-modules/pyxattr { };
pyaml = buildPythonPackage (rec {
name = "pyaml-15.02.1";
@ -17789,27 +17443,6 @@ in {
};
};
requests_oauth2 = buildPythonPackage rec {
name = "requests-oauth2-0.1.1";
# python3 does not support relative imports
disabled = isPy3k;
src = pkgs.fetchurl {
url = https://github.com/maraujop/requests-oauth2/archive/0.1.1.tar.gz;
sha256 = "1aij66qg9j5j4vzyh64nbg72y7pcafgjddxsi865racsay43xfqg";
};
propagatedBuildInputs = with self; [ requests ];
# no tests in tarball
doCheck = false;
meta = {
description = "Python's Requests OAuth2 (Open Authentication) plugin";
homepage = https://github.com/maraujop/requests-oauth2;
};
};
restview = callPackage ../development/python-modules/restview { };
readme = buildPythonPackage rec {
@ -18105,44 +17738,6 @@ in {
};
};
ropemacs = buildPythonPackage rec {
version = "0.7";
name = "ropemacs-${version}";
src = pkgs.fetchurl {
url = "mirror://pypi/r/ropemacs/${name}.tar.gz";
sha256 = "1x5qf1drcdz9jfiiakc60kzqkb3ahsg9j902c5byf3gjfacdrmqj";
};
propagatedBuildInputs = with self; [ ropemode ];
meta = {
description = "A plugin for performing python refactorings in emacs";
homepage = http://rope.sf.net/ropemacs.html;
maintainers = with maintainers; [ goibhniu ];
license = licenses.gpl2;
};
};
ropemode = buildPythonPackage rec {
version = "0.2";
name = "ropemode-${version}";
src = pkgs.fetchurl {
url = "mirror://pypi/r/ropemode/${name}.tar.gz";
sha256 = "0jw6h1wvk6wk0wknqdf7s9pw76m8472jv546lqdd88jbl2scgcjl";
};
propagatedBuildInputs = with self; [ rope ];
meta = {
description = "A plugin for performing python refactorings in emacs";
homepage = http://rope.sf.net;
maintainers = with maintainers; [ goibhniu ];
license = licenses.gpl2;
};
};
ropper = callPackage ../development/python-modules/ropper { };
routes = buildPythonPackage rec {
@ -18339,22 +17934,6 @@ in {
};
};
rtslib_fb = buildPythonPackage rec {
version = "2.1.fb43";
name = "rtslib-fb-${version}";
src = pkgs.fetchurl {
url = "https://github.com/agrover/rtslib-fb/archive/v${version}.tar.gz";
sha256 = "1b59vyy12g6rix9l2fxx0hjiq33shkb79v57gwffs57vh74wc53v";
};
meta = {
description = "A Python object API for managing the Linux LIO kernel target";
homepage = "https://github.com/agrover/rtslib-fb";
platforms = platforms.linux;
};
};
s3transfer = buildPythonPackage rec {
version = "0.1.10";
name = "s3transfer-${version}";
@ -19417,39 +18996,6 @@ in {
six = callPackage ../development/python-modules/six { };
skype4py = buildPythonPackage (rec {
name = "Skype4Py-1.0.32.0";
disabled = isPy3k || isPyPy;
src = pkgs.fetchurl {
url = mirror://sourceforge/skype4py/Skype4Py-1.0.32.0.tar.gz;
sha256 = "0cmkrv450wa8v50bng5dflpwkl5c1p9pzysjkb2956w5kvwh6f5b";
};
unpackPhase = ''
tar xf $src
find . -type d -exec chmod +rx {} \;
sourceRoot=`pwd`/`ls -d S*`
'';
# error: invalid command 'test'
doCheck = false;
propagatedBuildInputs = with self; [ pkgs.xorg.libX11 dbus-python pygobject2 ];
meta = {
description = "High-level, platform independent Skype API wrapper for Python";
# The advertisement says https://developer.skype.com/wiki/Skype4Py
# but that url does not work. This following web page points to the
# download link and has some information about the package.
homepage = http://pypi.python.org/pypi/Skype4Py/1.0.32.0;
broken = true;
license = "BSD";
};
});
smartdc = buildPythonPackage rec {
name = "smartdc-0.1.12";
@ -20102,57 +19648,6 @@ in {
tabulate = callPackage ../development/python-modules/tabulate { };
targetcli_fb = buildPythonPackage rec {
version = "2.1.fb33";
name = "targetcli-fb-${version}";
src = pkgs.fetchurl {
url = "https://github.com/agrover/targetcli-fb/archive/v${version}.tar.gz";
sha256 = "1zcm0agdpf866020b43fl8zyyyzz6r74mn1sz4xpaa0pinpwjk42";
};
propagatedBuildInputs = with self; [
configshell_fb
rtslib_fb
];
meta = {
description = "A command shell for managing the Linux LIO kernel target";
homepage = "https://github.com/agrover/targetcli-fb";
platforms = platforms.linux;
};
};
taskcoach = buildPythonPackage rec {
name = "TaskCoach-1.3.22";
disabled = isPy3k;
src = pkgs.fetchurl {
url = "mirror://sourceforge/taskcoach/${name}.tar.gz";
sha256 = "1ddx56bqmh347synhgjq625ijv5hqflr0apxg0nl4jqdsqk1zmxh";
};
propagatedBuildInputs = with self; [ wxPython ];
# I don't know why I need to add these libraries. Shouldn't they
# be part of wxPython?
postInstall = ''
libspaths=${with pkgs.xorg; pkgs.lib.makeLibraryPath [ libSM libXScrnSaver ]}
wrapProgram $out/bin/taskcoach.py \
--prefix LD_LIBRARY_PATH : $libspaths
'';
# error: invalid command 'test'
doCheck = false;
meta = {
homepage = http://taskcoach.org/;
description = "Todo manager to keep track of personal tasks and todo lists";
license = licenses.gpl3Plus;
broken = stdenv.isDarwin;
};
};
taskw = buildPythonPackage rec {
version = "1.0.3";
name = "taskw-${version}";
@ -20514,29 +20009,6 @@ in {
};
};
trac = buildPythonPackage {
name = "trac-1.0.1";
disabled = isPy3k;
src = pkgs.fetchurl {
url = http://ftp.edgewall.com/pub/trac/Trac-1.0.1.tar.gz;
sha256 = "1nqa95fcnkpyq4jk6az7l7sqgm3b3pjq3bx1n7y4v3bad5jr1m4x";
};
# couple of failing tests
doCheck = false;
PYTHON_EGG_CACHE = "`pwd`/.egg-cache";
propagatedBuildInputs = with self; [ genshi ];
meta = {
description = "Enhanced wiki and issue tracking system for software development projects";
license = "BSD";
};
};
traits = buildPythonPackage rec {
name = "traits-${version}";
version = "4.5.0";
@ -21438,26 +20910,6 @@ EOF
widgetsnbextension = callPackage ../development/python-modules/widgetsnbextension { };
wokkel = buildPythonPackage (rec {
url = "http://wokkel.ik.nu/releases/0.7.0/wokkel-0.7.0.tar.gz";
name = nameFromURL url ".tar";
src = pkgs.fetchurl {
inherit url;
sha256 = "0rnshrzw8605x05mpd8ndrx3ri8h6cx713mp8sl4f04f4gcrz8ml";
};
disabled = isPy3k;
propagatedBuildInputs = with self; [twisted dateutil];
meta = {
description = "Some (mainly XMPP-related) additions to twisted";
homepage = "http://wokkel.ik.nu/";
license = licenses.mit;
};
});
magic-wormhole = callPackage ../development/python-modules/magic-wormhole { };
wsgiproxy2 = buildPythonPackage rec {
@ -21498,23 +20950,6 @@ EOF
propagatedBuildInputs = with self; [ eventlib application ];
};
xe = buildPythonPackage rec {
url = "http://www.blarg.net/%7Esteveha/xe-0.7.4.tar.gz";
name = stdenv.lib.nameFromURL url ".tar";
src = pkgs.fetchurl {
inherit url;
sha256 = "0v9878cl0y9cczdsr6xjy8v9l139lc23h4m5f86p4kpf2wlnpi42";
};
# error: invalid command 'test'
doCheck = false;
meta = {
homepage = "http://home.blarg.net/~steveha/xe.html";
description = "XML elements";
};
};
xlib = buildPythonPackage (rec {
name = "xlib-${version}";
version = "0.17";
@ -23168,29 +22603,6 @@ EOF
};
};
redNotebook = buildPythonPackage rec {
name = "rednotebook-1.8.1";
src = pkgs.fetchurl {
url = "mirror://sourceforge/rednotebook/${name}.tar.gz";
sha256 = "00b7s4xpqpxsbzjvjx9qsx5d84m9pvn383c5di1nsfh35pig0rzn";
};
# no tests available
doCheck = false;
propagatedBuildInputs = with self; [ pygtk pywebkitgtk pyyaml chardet ];
meta = {
homepage = http://rednotebook.sourceforge.net/index.html;
description = "A modern journal that includes a calendar navigation, customizable templates, export functionality and word clouds";
license = licenses.gpl2;
maintainers = with maintainers; [ tstrobel ];
};
};
uncertainties = callPackage ../development/python-modules/uncertainties { };
funcy = buildPythonPackage rec {