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

Merge branch 'master' into staging

Browse Source
This commit is contained in:
obadz
2016-08-21 12:03:41 +01:00
parent 15b07f4b8e c2192c664a
commit 68936edfb3
39 changed files with 182 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/backup/areca/default.nix
View File

@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
name = "areca-7.5";
src = fetchurl {
url = "http://downloads.sourceforge.net/project/areca/areca-stable/areca-7.5/areca-7.5-src.tar.gz";
url = "mirror://sourceforge/project/areca/areca-stable/areca-7.5/areca-7.5-src.tar.gz";
sha256 = "1q4ha9s96c1syplxm04bh1v1gvjq16l4pa8w25w95d2ywwvyq1xb";
};

2
pkgs/applications/editors/ht/default.nix
View File

@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
name = "ht-${version}";
version = "2.1.0";
src = fetchurl {
url = "http://sourceforge.net/projects/hte/files/ht-source/ht-${version}.tar.bz2";
url = "mirror://sourceforge/project/hte/ht-source/ht-${version}.tar.bz2";
sha256 = "0w2xnw3z9ws9qrdpb80q55h6ynhh3aziixcfn45x91bzrbifix9i";
};
buildInputs = [

33
pkgs/applications/graphics/ao/default.nix Normal file
View File

@@ -0,0 +1,33 @@
{stdenv, fetchgit, cmake, ninja, boost, libpng, glfw3, epoxy, guile, pkgconfig
, mesa, libX11, libpthreadstubs, libXau, libXdmcp, libXrandr, libXext
, libXinerama, libXxf86vm, libXcursor, libXfixes
}:
stdenv.mkDerivation rec {
version = "0.0pre20160820";
name = "ao-${version}";
buildInputs = [
cmake ninja boost libpng glfw3 epoxy guile pkgconfig mesa libX11
libpthreadstubs libXau libXdmcp libXrandr libXext libXinerama libXxf86vm
libXcursor libXfixes
];
src = fetchgit (stdenv.lib.importJSON ./src.json);
cmakeFlags = "-G Ninja";
buildPhase = "ninja";
installPhase = ''
ninja install
cd ..
cp lib/lib* bind/lib* "$out/lib"
cp -r bin "$out/bin"
mkdir "$out/doc"
cp -r doc "$out/doc/ao"
cp -r examples "$out/doc/ao/examples"
cp -r bind "$out/bind"
'';
meta = {
inherit version;
description = ''Homoiconic CAD package'';
license = stdenv.lib.licenses.gpl2Plus ; # Some parts can be extracted and used under LGPL2+
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
};
}

5
pkgs/applications/graphics/ao/src.json Normal file
View File

@@ -0,0 +1,5 @@
{
"url": "https://github.com/mkeeter/ao",
"rev": "69fadb81543cc9031e4a7ec2036c7f2ab505a620",
"sha256": "1717k72vr0i5j7bvxmd6q16fpvkljnqfa1hr3i4yq8cjdsj69my7"
}

2
pkgs/applications/misc/gammu/default.nix
View File

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
version = "1.33.0";
src = fetchurl {
url = "http://sourceforge.net/projects/gammu/files/gammu/${version}/gammu-${version}.tar.xz";
url = "mirror://sourceforge/project/gammu/gammu/${version}/gammu-${version}.tar.xz";
sha256 = "18gplx1v9d70k1q86d5i4n4dfpx367g34pj3zscppx126vwhv112";
};

2
pkgs/applications/misc/mlterm/default.nix
View File

@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "3.3.8";
src = fetchurl {
url = "https://downloads.sourceforge.net/project/mlterm/01release/${name}/${name}.tar.gz";
url = "mirror://sourceforge/project/mlterm/01release/${name}/${name}.tar.gz";
sha256 = "088pgxynzxxii7wdmjp2fdkxydirx4k05588zkhlzalkb5l8ji1i";
};

2
pkgs/applications/misc/xautoclick/default.nix
View File

@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
version = "0.31";
name = "xautoclick-${version}";
src = fetchurl {
url = "http://downloads.sourceforge.net/project/xautoclick/xautoclick/xautoclick-0.31/xautoclick-0.31.tar.gz";
url = "mirror://sourceforge/project/xautoclick/xautoclick/xautoclick-0.31/xautoclick-0.31.tar.gz";
sha256 = "0h522f12a7v2b89411xm51iwixmjp2mp90rnizjgiakx9ajnmqnm";
};
buildInputs = [ xorg.libX11 xorg.libXtst xorg.xinput xorg.libXi xorg.libXext pkgconfig ]

2
pkgs/applications/science/misc/openmodelica/default.nix
View File

@@ -26,6 +26,8 @@ stdenv.mkDerivation {
'';
configurePhase = ''
export NIX_LDFLAGS="$NIX_LDFLAGS -L${gfortran.cc.lib}/lib"
autoconf
./configure CC=${clang}/bin/clang CXX=${clang}/bin/clang++ --prefix=$out
'';

2
pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix
View File

@@ -3,7 +3,7 @@
stdenv.mkDerivation {
name = "wmsystemtray-1.4";
src = fetchurl {
url = http://sourceforge.net/projects/wmsystemtray/files/wmsystemtray/wmsystemtray-1.4.tar.gz;
url = mirror://sourceforge/project/wmsystemtray/wmsystemtray/wmsystemtray-1.4.tar.gz;
sha256 = "8edef43691e9fff071000e29166c7c1ad420c0956e9068151061e881c8ac97e9";
};