diff options
Diffstat (limited to 'pkgs/applications')
4 files changed, 63 insertions, 4 deletions
diff --git a/pkgs/applications/graphics/panotools/default.nix b/pkgs/applications/graphics/panotools/default.nix index 8e5204ac6382..9ca90d2f5df3 100644 --- a/pkgs/applications/graphics/panotools/default.nix +++ b/pkgs/applications/graphics/panotools/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, libjpeg, libpng, libtiff, perl }: stdenv.mkDerivation rec { - name = "libpano13-2.9.18"; + name = "libpano13-2.9.19"; src = fetchurl { url = "mirror://sourceforge/panotools/${name}.tar.gz"; - sha256 = "0wm1r9waa47n482yrl3hnphicdahr581rahgbklk0d2wy51lwpfy"; + sha256 = "1a4m3plmfcrrplqs9zfzhc5apibn10m5sajpizm1sd3q74w5fwq3"; }; buildInputs = [ perl libjpeg libpng libtiff ]; diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/pkgs/applications/networking/mailreaders/mailpile/default.nix index 1e68d2e90b8d..2b1e9fc4fb34 100644 --- a/pkgs/applications/networking/mailreaders/mailpile/default.nix +++ b/pkgs/applications/networking/mailreaders/mailpile/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = with pythonPackages; [ - pillow jinja2 spambayes pythonPackages."lxml-2.3.6" python.modules.readline or null]; + pillow jinja2 spambayes pythonPackages.lxml python.modules.readline or null]; meta = with stdenv.lib; { description = "A modern, fast web-mail client with user-friendly encryption and privacy features"; diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix new file mode 100644 index 000000000000..a3d4783d20d1 --- /dev/null +++ b/pkgs/applications/version-management/smartgithg/default.nix @@ -0,0 +1,59 @@ +{ stdenv, fetchurl, lib, makeWrapper +, jdk +, gtk, glib +, libXtst +, git, mercurial, subversion +, which +}: + +let + the_version = "6_0_6"; + +in + +stdenv.mkDerivation rec { + name = "smartgithg-${the_version}"; + + src = fetchurl { + url = "http://www.syntevo.com/download/smartgithg/" + + "smartgithg-generic-${the_version}.tar.gz"; + sha256 = "13e41560138ef18395fbe0bf56d4d29e8614eee004d51d7dd03381080d8426e6"; + }; + + buildInputs = [ + makeWrapper + jdk + ]; + + buildCommand = let + pkg_path = "$out/${name}"; + bin_path = "$out/bin"; + runtime_paths = lib.makeSearchPath "bin" [ + jdk + git mercurial subversion + which + ]; + runtime_lib_paths = lib.makeLibraryPath [ + gtk glib + libXtst + ]; + in '' + tar xvzf $src + mkdir -pv $out + # unpacking should have produced a dir named ${name} + cp -a ${name} $out + mkdir -pv ${bin_path} + makeWrapper ${pkg_path}/bin/smartgithg.sh ${bin_path}/smartgithg \ + --prefix PATH : ${runtime_paths} \ + --prefix LD_LIBRARY_PATH : ${runtime_lib_paths} \ + --prefix JDK_HOME : ${jdk}/lib/openjdk + patchShebangs $out + ''; + + meta = with stdenv.lib; { + description = "GUI for Git, Mercurial, Subversion"; + homepage = http://www.syntevo.com/smartgithg/; + license = licenses.unfree; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix index 73c5e5df81af..f019ba9751b9 100644 --- a/pkgs/applications/window-managers/jwm/default.nix +++ b/pkgs/applications/window-managers/jwm/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "jwm-2.2.2"; src = fetchurl { - url = "http://www.joewing.net/programs/jwm/releases/${name}.tar.xz"; + url = "http://www.joewing.net/projects/jwm/releases/${name}.tar.xz"; sha256 = "0nhyy78c6imk85d47bakk460x0cfhkyghqq82zghmb00dhwiryln"; }; |