mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-09-11 15:08:33 +01:00
Update from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19066
This commit is contained in:
commit
310d6e4bbf
|
@ -2,24 +2,21 @@ args: with args;
|
|||
stdenv.mkDerivation {
|
||||
name = "synergy-cvs";
|
||||
|
||||
# REGION AUTO UPDATE: { name="synergy"; type = "cvs"; cvsRoot = ":pserver:anonymous@synergy2.cvs.sourceforge.net:/cvsroot/synergy2"; module="syngery"; }
|
||||
src = sourceFromHead "synergy-F_09-55-29.tar.gz"
|
||||
(fetchurl { url = "http://mawercer.de/~nix/repos/synergy-F_09-55-28.tar.gz"; sha256 = "443bb8cf8d4e365b2adaadd8770096fcafa0c54532e83f6a267eb3b05042b84c"; });
|
||||
# END
|
||||
/*
|
||||
fetchcvs {
|
||||
cvsRoot = ":pserver:anonymous@synergy2.cvs.sourceforge.net:/cvsroot/synergy2";
|
||||
module = "synergy";
|
||||
date = "NOW";
|
||||
sha256 = "0a52b3adaae5f41cf16c5911c9037c5f2ee704a27bcaa9f874e3a4ff58d773c1";
|
||||
};
|
||||
*/
|
||||
# note: There is a fork:
|
||||
# http://code.google.com/p/synergy-plus
|
||||
|
||||
buildInputs = [x11 xextproto libXtst inputproto libXi];
|
||||
# REGION AUTO UPDATE: { name="synergy"; type = "cvs"; cvsRoot = ":pserver:anonymous@synergy2.cvs.sourceforge.net:/cvsroot/synergy2"; module="syngery"; }
|
||||
src= sourceFromHead "synergy-F_23-55-02.tar.gz"
|
||||
(fetchurl { url = "http://mawercer.de/~nix/repos/synergy-F_23-55-02.tar.gz"; sha256 = "ae16a9b59039a32e383e71397405d7b610de6c6902c03177c2496bac440d3e28"; });
|
||||
# END
|
||||
|
||||
buildInputs = [x11 xextproto libXtst inputproto libXi automake autoconf autoconf];
|
||||
|
||||
preConfigure = "autoreconf; ";
|
||||
|
||||
patches = [ (fetchurl {
|
||||
url = http://mawercer.de/~nix/syncergy-gcc43.patch.gz;
|
||||
sha256 = "12kla0nii6qc9fy5x4dc4qisfcyl9dqnrj5y911davnvwkwlj18h";
|
||||
url = http://mawercer.de/~nix/synergy-gcc43-r2.patch.gz;
|
||||
sha256 = "0wnj5k93ybj7jg8ml1i1brwsnszfh41117q2qh7r8xr9m37997b7";
|
||||
}) ];
|
||||
|
||||
meta= {
|
||||
|
|
|
@ -4,13 +4,13 @@
|
|||
, freetype, fontconfig
|
||||
, application ? "browser" }:
|
||||
|
||||
let version = "3.5.5"; in
|
||||
let version = "3.5.6"; in
|
||||
stdenv.mkDerivation {
|
||||
name = "icecat-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/gnuzilla/${version}/icecat-${version}.tar.bz2";
|
||||
sha256 = "1mwk81vkay007k1rcx9hdmfl2540lj5nrxxv3zagifbaala89c3d";
|
||||
sha256 = "10lacri0imag90ib1lg4caxljzsfzryysygx22ja3akfwjlkrk8c";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
19
pkgs/applications/science/electronics/gtkwave/default.nix
Normal file
19
pkgs/applications/science/electronics/gtkwave/default.nix
Normal file
|
@ -0,0 +1,19 @@
|
|||
{stdenv, fetchurl, gtk, gperf, pkgconfig, bzip2} :
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gtkwave-3.2.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/gtkwave/${name}.tar.gz";
|
||||
sha256 = "1ym8fw6cv76gn80qzh6a5y7gikqgnz65hwy0cp6p6h18i5ghgfs0";
|
||||
};
|
||||
|
||||
buildInputs = [ gtk gperf pkgconfig bzip2 ];
|
||||
|
||||
meta = {
|
||||
description = "Wave viewer for Unix and Win32";
|
||||
homepage = http://gtkwave.sourceforge.net;
|
||||
license = "GPLv2+";
|
||||
maintainers = with stdenv.lib.maintainers; [viric];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
};
|
||||
}
|
|
@ -46,9 +46,9 @@ rec {
|
|||
|
||||
topGit = stdenv.mkDerivation {
|
||||
name = "TopGit-git"; # official release 0.8
|
||||
# REGION AUTO UPDATE: { name = "topGit"; type="git"; url="http://repo.or.cz/w/topgit.git"; }
|
||||
src = sourceFromHead "topGit-f59e4f9e87e5f485fdaee0af002edd2105fa298a.tar.gz"
|
||||
(fetchurl { url = "http://mawercer.de/~nix/repos/topGit-f59e4f9e87e5f485fdaee0af002edd2105fa298a.tar.gz"; sha256 = "12aa6d34c82d505066b851e24069fe9d6930d70913b7d94a0cc6e8f06f127170"; });
|
||||
# REGION AUTO UPDATE: { name = "topGit"; type="git"; url="http://repo.or.cz/w/topgit.git"; }
|
||||
src= sourceFromHead "topGit-341a3713f5c399f97c5c68a74772b12bb3d2ca57.tar.gz"
|
||||
(fetchurl { url = "http://mawercer.de/~nix/repos/topGit-341a3713f5c399f97c5c68a74772b12bb3d2ca57.tar.gz"; sha256 = "4d53343ed9ba735fb598d6576b20f2641d5a8374a5a11b21fcbcdc6da885e872"; });
|
||||
# END
|
||||
phases="unpackPhase patchPhase installPhase";
|
||||
installPhase = ''
|
||||
|
|
24
pkgs/os-specific/linux/afuse/default.nix
Normal file
24
pkgs/os-specific/linux/afuse/default.nix
Normal file
|
@ -0,0 +1,24 @@
|
|||
args: with args;
|
||||
stdenv.mkDerivation {
|
||||
name = "afuse-0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://sourceforge/afuse/0.2/afuse-0.2.tar.gz;
|
||||
sha256 = "1lj2jdks0bgwxbjqp5a9f7qdry19kar6pg7dh1ml98gapx9siylj";
|
||||
};
|
||||
|
||||
buildInputs = [pkgconfig fuse];
|
||||
|
||||
meta = {
|
||||
description = "automounting in userspace. Allows easy access to ssh-agent etc";
|
||||
longDesc = ''
|
||||
Example: (automunt using sshfs by accessing ~/sshfs/[user@]domain
|
||||
afuse -o mount_template="sshfs %r:/ %m" -o unmount_template="fusermount -u -z %m" ~/sshfs/
|
||||
'';
|
||||
homepage = http://sourceforge.net/projects/afuse;
|
||||
license = "GPL-v2";
|
||||
maintainers = [args.lib.maintainers.marcweber];
|
||||
platforms = args.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -20,6 +20,7 @@ stdenv.mkDerivation {
|
|||
patchPhase = ''
|
||||
substituteInPlace configure --replace /bin/stty "$(type -tP stty)"
|
||||
sed -e '1i\#include <tclInt.h>' -i exp_inter.c
|
||||
export NIX_LDFLAGS="-rpath $out/lib $NIX_LDFLAGS"
|
||||
'';
|
||||
|
||||
configureFlags = ["--with-tcl=${tcl}/lib"
|
||||
|
@ -31,4 +32,5 @@ stdenv.mkDerivation {
|
|||
description = "A tool for automating interactive applications";
|
||||
homepage = http://expect.nist.gov/;
|
||||
};
|
||||
postInstall="cp expect{,k} $out/bin; ensureDir $out/lib; cp *.so $out/lib";
|
||||
}
|
||||
|
|
|
@ -5291,6 +5291,10 @@ let
|
|||
|
||||
### OS-SPECIFIC
|
||||
|
||||
afuse = import ../os-specific/linux/afuse {
|
||||
inherit fetchurl stdenv lib pkgconfig fuse;
|
||||
};
|
||||
|
||||
autofs5 = import ../os-specific/linux/autofs/autofs-v5.nix {
|
||||
inherit sourceFromHead fetchurl stdenv flex bison kernelHeaders;
|
||||
};
|
||||
|
@ -7585,7 +7589,7 @@ let
|
|||
|
||||
# linux only by now
|
||||
synergy = import ../applications/misc/synergy {
|
||||
inherit fetchurl sourceFromHead stdenv x11;
|
||||
inherit fetchurl sourceFromHead stdenv x11 automake autoconf;
|
||||
inherit (xlibs) xextproto libXtst inputproto libXi;
|
||||
};
|
||||
|
||||
|
@ -8307,6 +8311,11 @@ let
|
|||
gccSrc = gcc43.gcc.src;
|
||||
};
|
||||
|
||||
gtkwave = import ../applications/science/electronics/gtkwave {
|
||||
inherit fetchurl stdenv gperf pkgconfig bzip2;
|
||||
inherit (gtkLibs) gtk;
|
||||
};
|
||||
|
||||
### SCIENCE / MATH
|
||||
|
||||
maxima = import ../applications/science/math/maxima {
|
||||
|
|
|
@ -2430,10 +2430,10 @@ rec {
|
|||
};
|
||||
|
||||
URI = buildPerlPackage rec {
|
||||
name = "URI-1.37";
|
||||
name = "URI-1.51";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/G/GA/GAAS/${name}.tar.gz";
|
||||
sha256 = "0amwbss2gz00fkdfnfixf1afmqal1246xhmj27g5c0ny7ahcid0j";
|
||||
sha256 = "0gfdphz0yhm62vn9cbw720i6pm1gingcir15dq8ppbnk6cylnyal";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue