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

Merge remote-tracking branch 'upstream/master' into HEAD

Browse Source
This commit is contained in:
Frederik Rietdijk 2017-03-18 15:32:43 +01:00
commit e67b979ab5
11 changed files with 178 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/release.nix
View File

@ -302,6 +302,7 @@ in rec {
tests.tomcat = callTest tests/tomcat.nix {};
tests.udisks2 = callTest tests/udisks2.nix {};
tests.virtualbox = callSubTests tests/virtualbox.nix { system = "x86_64-linux"; };
tests.wordpress = callTest tests/wordpress.nix {};
tests.xfce = callTest tests/xfce.nix {};

1
pkgs/applications/misc/kiwix/default.nix
View File

@ -104,6 +104,7 @@ stdenv.mkDerivation rec {
description = "An offline reader for Web content";
homepage = http://kiwix.org;
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ robbinch ];
};
}

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

@ -1,25 +1,29 @@
{stdenv, fetchurl, pythonPackages}:
{stdenv, fetchurl, python27Packages, file }:
let
inherit (pythonPackages) python;
in stdenv.mkDerivation rec {
url = "ftp://ftp.goffi.org/sat/sat-0.2.0.tar.bz2";
name = stdenv.lib.nameFromURL url ".tar";
inherit (python27Packages) python;
in
stdenv.mkDerivation rec {
name = "salut-a-toi";
version = "0.6.1";
pname = "sat-${version}";
src = fetchurl {
inherit url;
sha256 = "14qqgsgqns1xcp97nd3jcxrq54z1x5a6kimqxy029hh7ys813mf1";
url = "ftp://ftp.goffi.org/sat/${pname}.tar.bz2";
sha256 = "0kn9403n8fpzl0hsb9kkzicsmzq2fjl627l31yykbqzc4nsr780d";
};
buildInputs = with pythonPackages;
buildInputs = with python27Packages;
[
python twisted urwid beautifulsoup wxPython pygobject2
wokkel dbus-python pyfeed wrapPython setuptools
wokkel dbus-python pyfeed wrapPython setuptools file
pycrypto pyxdg
];
configurePhase = ''
sed -i "/use_setuptools/d" setup.py
sed -e "s@sys.prefix@'$out'@g" -i setup.py
sed -e "1aexport PATH=\"\$PATH\":\"$out/bin\":\"${pythonPackages.twisted}/bin\"" -i src/sat.sh
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
@ -39,11 +43,11 @@ in stdenv.mkDerivation rec {
done
'';
meta = {
homepage = "http://sat.goffi.org/";
meta = with stdenv.lib; {
homepage = http://sat.goffi.org/;
description = "A multi-frontend XMPP client";
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [raskin];
license = stdenv.lib.licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = [ maintainers.raskin ];
license = licenses.gpl3Plus;
};
}

4
pkgs/applications/video/gnome-mplayer/default.nix
View File

@ -4,12 +4,14 @@ stdenv.mkDerivation rec {
name = "gnome-mplayer-1.0.4";
src = fetchurl {
url = "http://gnome-mplayer.googlecode.com/files/${name}.tar.gz";
url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/gnome-mplayer/${name}.tar.gz";
sha256 = "1k5yplsvddcm7xza5h4nfb6vibzjcqsk8gzis890alizk07f5xp2";
};
buildInputs = [pkgconfig glib gtk2 dbus dbus_glib GConf];
hardeningDisable = [ "format" ];
meta = {
homepage = http://kdekorte.googlepages.com/gnomemplayer;
description = "Gnome MPlayer, a simple GUI for MPlayer";

32
pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix Normal file
View File

@ -0,0 +1,32 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, opam, topkg, cppo
, ppx_import, ppx_deriving, yojson, ounit
}:
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-ppx_deriving_yojson-${version}";
version = "3.0";
src = fetchFromGitHub {
owner = "whitequark";
repo = "ppx_deriving_yojson";
rev = "v${version}";
sha256 = "1id1a29qq0ax9qp98b5hv6p2q2r0vp4fbkkwzm1bxdhnasw97msk";
};
buildInputs = [ ocaml findlib ocamlbuild opam cppo ounit ppx_import ];
propagatedBuildInputs = [ ppx_deriving yojson ];
inherit (topkg) installPhase;
doCheck = true;
checkTarget = "test";
meta = {
description = "A Yojson codec generator for OCaml >= 4.02.";
inherit (src.meta) homepage;
license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.vbgl ];
inherit (ocaml.meta) platforms;
};
}

36
pkgs/development/tools/misc/xxdiff/tip.nix Normal file
View File

@ -0,0 +1,36 @@
{ stdenv, fetchFromBitbucket, qt5, flex, bison, docutils }:
stdenv.mkDerivation rec {
name = "xxdiff-4.0.1.20170101";
src = fetchFromBitbucket {
owner = "blais";
repo = "xxdiff";
rev = "1cf6b23ad30a845daba28a3409c65f93aec7f5e8";
sha256 = "0rq7grpndj85i7qzlj93jpzpfzk7bwsi55033fc63hb55rbdzz6z";
};
nativeBuildInputs = [ flex bison qt5.qtbase docutils ];
buildInputs = [ qt5.qtbase ];
preConfigure = ''
ln -s ${qt5.qtbase.dev}/mkspecs/* ../__nix_qt*__/mkspecs
ln -s ${qt5.qtbase.dev}/bin/* ../__nix_qt*__/bin || true
'';
NIX_CFLAGS_COMPILE="-I${qt5.qtbase.dev}/include/QtCore -I${qt5.qtbase.dev}/include/QtGui -I${qt5.qtbase.dev}/include/QtWidgets";
configurePhase = "${preConfigure} cd src; make -f Makefile.bootstrap";
installPhase = "mkdir -pv $out/bin; cp -v ../bin/xxdiff $out/bin";
meta = with stdenv.lib; {
homepage = http://furius.ca/xxdiff/;
description = "Graphical file and directories comparator and merge tool";
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ pSub raskin ];
};
}

33
pkgs/tools/X11/wayv/default.nix Normal file
View File

@ -0,0 +1,33 @@
{stdenv, fetchFromGitHub, libX11}:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "wayv";
version = "0.3";
src = fetchFromGitHub {
owner = "mikemb";
repo = pname;
rev = "b716877603250f690f08b593bf30fd5e8a93a872";
sha256 = "046dvaq6na1fyxz5nrjg13aaz6ific9wbygck0dknqqfmmjrsv3b";
};
buildInputs = [ libX11 ];
postInstall = ''
make -C doc install
mkdir -p "$out"/share/doc/wayv
cp [A-Z][A-Z]* "$out"/share/doc/wayv
cp doc/[A-Z][A-Z]* "$out"/share/doc/wayv
cp doc/*.txt "$out"/share/doc/wayv
cp doc/*.jpg "$out"/share/doc/wayv
'';
meta = {
inherit version;
description = "A gesture control for X11";
license = stdenv.lib.licenses.gpl2Plus ;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
homepage = "https://github.com/mikemb/wayV";
};
}

24
pkgs/tools/X11/xannotate/default.nix Normal file
View File

@ -0,0 +1,24 @@
{stdenv, fetchFromBitbucket, libX11}:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "xannotate";
version = "20150301";
src = fetchFromBitbucket {
owner = "blais";
repo = pname;
rev = "e5591c2ec67ca39988f1fb2966e94f0f623f9aa7";
sha256 = "02jy19if0rnbxvs6b0l5mi9ifvdj2qmv0pv278v9kfs0kvir68ik";
};
buildInputs = [ libX11 ];
meta = {
inherit version;
description = "A tool to scribble over X windows";
license = stdenv.lib.licenses.gpl2Plus ;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
homepage = "https://bitbucket.org/blais/xannotate";
};
}

2
pkgs/tools/misc/idutils/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
buildInputs = stdenv.lib.optional stdenv.isLinux emacs;
doCheck = true;
doCheck = !stdenv.isDarwin;
patches = [ ./nix-mapping.patch ];

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

@ -6909,6 +6909,7 @@ with pkgs;
xxdiff = callPackage ../development/tools/misc/xxdiff {
bison = bison2;
};
xxdiff-tip = callPackage ../development/tools/misc/xxdiff/tip.nix { };
yacc = bison;
@ -15872,6 +15873,8 @@ with pkgs;
imlib2 = imlib2-nox;
};
wayv = callPackage ../tools/X11/wayv {};
weechat = callPackage ../applications/networking/irc/weechat {
inherit (darwin) libobjc;
inherit (darwin) libresolv;
@ -16011,6 +16014,8 @@ with pkgs;
x42-plugins = callPackage ../applications/audio/x42-plugins { };
xannotate = callPackage ../tools/X11/xannotate {};
xaos = callPackage ../applications/graphics/xaos {
libpng = libpng12;
};

2
pkgs/top-level/ocaml-packages.nix
View File

@ -483,6 +483,8 @@ let
then callPackage ../development/ocaml-modules/ppx_deriving {}
else null;
ppx_deriving_yojson = callPackage ../development/ocaml-modules/ppx_deriving_yojson {};
ppx_import = callPackage ../development/ocaml-modules/ppx_import {};
ppx_tools =