diff options
-rw-r--r-- | pkgs/applications/science/math/mathematica/default.nix | 2 | ||||
-rw-r--r-- | pkgs/desktops/gnome-2/desktop/libgweather/default.nix | 4 | ||||
-rw-r--r-- | pkgs/lib/licenses.nix | 16 |
3 files changed, 10 insertions, 12 deletions
diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index d0429a45190e0..cedb491cc8b9b 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -23,7 +23,7 @@ let else if stdenv.system == "x86_64-linux" then "Linux-x86-64" else - abort "Mathematica requires i686-linux or x86_64 linux"; + throw "Mathematica requires i686-linux or x86_64 linux"; in stdenv.mkDerivation rec { diff --git a/pkgs/desktops/gnome-2/desktop/libgweather/default.nix b/pkgs/desktops/gnome-2/desktop/libgweather/default.nix index dc8057ff0f547..7a1b4d1f5318a 100644 --- a/pkgs/desktops/gnome-2/desktop/libgweather/default.nix +++ b/pkgs/desktops/gnome-2/desktop/libgweather/default.nix @@ -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 { name = "libgweather-2.30.3"; diff --git a/pkgs/lib/licenses.nix b/pkgs/lib/licenses.nix index c5c9133da6eb1..55517c5e1e5e4 100644 --- a/pkgs/lib/licenses.nix +++ b/pkgs/lib/licenses.nix @@ -34,11 +34,9 @@ url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/licenses/AMD-ADL?revision=1.1"; }; - apsl20 = { - shortName = "APSL 2.0"; - fullName = "Apple Public Source License 2.0"; - url = http://opensource.org/licenses/APSL-2.0; - }; + # Apple Public Source License 2.0; + # http://opensource.org/licenses/APSL-2.0 + apsl20 = "APSL 2.0"; asl20 = { shortName = "ASL2.0"; @@ -96,11 +94,9 @@ url = http://www.mysql.com/about/legal/licensing/foss-exception; }; - gpl2Plus = { - shortName = "GPLv2+"; - fullName = "GNU General Public License version 2 or later"; - url = http://www.gnu.org/licenses/old-licenses/gpl-2.0.html; - }; + # GNU General Public License version 2 or later; + # http://www.gnu.org/licenses/old-licenses/gpl-2.0.html + gpl2Plus = "GPLv2+"; gpl3 = { shortName = "GPLv3"; |