alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Fix evaluation errors

Browse source
This commit is contained in:
Eelco Dolstra 2013-10-01 13:12:10 +02:00
parent b0c1424788
commit fca11ef500
3 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/science/math/mathematica/default.nix
View file

@ -23,7 +23,7 @@ let
else if stdenv.system == "x86_64-linux" then else if stdenv.system == "x86_64-linux" then
"Linux-x86-64" "Linux-x86-64"
else else
abort "Mathematica requires i686-linux or x86_64 linux"; throw "Mathematica requires i686-linux or x86_64 linux";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {

4
pkgs/desktops/gnome-2/desktop/libgweather/default.nix
View file

@ -1,4 +1,6 @@
{stdenv, fetchurl, pkgconfig, libxml2, gtk, intltool, GConf, libsoup, libtasn1, nettle, gmp}: { stdenv, fetchurl, pkgconfig, libxml2, gtk, intltool, GConf, libsoup, libtasn1, nettle, gmp }:
assert stdenv.isLinux;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libgweather-2.30.3"; name = "libgweather-2.30.3";

16
pkgs/lib/licenses.nix
View file

@ -34,11 +34,9 @@
url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/licenses/AMD-ADL?revision=1.1"; url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/licenses/AMD-ADL?revision=1.1";
}; };
apsl20 = { # Apple Public Source License 2.0;
shortName = "APSL 2.0"; # http://opensource.org/licenses/APSL-2.0
fullName = "Apple Public Source License 2.0"; apsl20 = "APSL 2.0";
url = http://opensource.org/licenses/APSL-2.0;
};
asl20 = { asl20 = {
shortName = "ASL2.0"; shortName = "ASL2.0";
@ -96,11 +94,9 @@
url = http://www.mysql.com/about/legal/licensing/foss-exception; url = http://www.mysql.com/about/legal/licensing/foss-exception;
}; };
gpl2Plus = { # GNU General Public License version 2 or later;
shortName = "GPLv2+"; # http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
fullName = "GNU General Public License version 2 or later"; gpl2Plus = "GPLv2+";
url = http://www.gnu.org/licenses/old-licenses/gpl-2.0.html;
};
gpl3 = { gpl3 = {
shortName = "GPLv3"; shortName = "GPLv3";