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

Merge remote-tracking branch 'origin/master' into staging.

Browse Source 
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
This commit is contained in:
Peter Simons
2014-08-04 16:51:47 +02:00
parent 9253a95f6b b35770818d
commit 2d326e5032
1261 changed files with 4697 additions and 3318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/java/geoipjava/default.nix
View File

@@ -20,7 +20,7 @@ stdenv.mkDerivation {
'';
meta = {
description = "GeoIP Java API";
license = "LGPL2.1+";
license = stdenv.lib.licenses.lgpl21Plus;
maintainers = [ stdenv.lib.maintainers.sander ];
};
}

2
pkgs/development/libraries/java/libmatthew-java/default.nix
View File

@@ -3,7 +3,7 @@
stdenv.mkDerivation {
name = "libmatthew-java-0.8";
src = fetchurl {
url = http://www.matthew.ath.cx/projects/java/libmatthew-java-0.8.tar.gz;
url = http://pkgs.fedoraproject.org/repo/pkgs/libmatthew-java/libmatthew-java-0.8.tar.gz/8455b8751083ce25c99c2840609271f5/libmatthew-java-0.8.tar.gz;
sha256 = "1yldkhsdzm0a41a0i881bin2jklhp85y3ah245jd6fz3npcx7l85";
};
JAVA_HOME=jdk;

2
pkgs/development/libraries/java/swt/default.nix
View File

@@ -14,7 +14,7 @@ stdenv.mkDerivation {
# releases of SWT. So we just grab a binary release and extract
# "src.zip" from that.
src = fetchurl {
url = "http://eclipse.ialto.com/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86.zip";
url = "http://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86.zip";
sha256 = "10si8kmc7c9qmbpzs76609wkfb784pln3qpmra73gb3fbk7z8caf";
};