From d3f5d94ac7bcbabc61300c0141e4a9c85e777db3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 2 Jul 2009 09:08:01 +0000 Subject: [PATCH] * Fix some attributes that now make nix-env -q --meta barf. svn path=/nixpkgs/trunk/; revision=16134 --- pkgs/applications/misc/audio/sox/default.nix | 9 +++++---- pkgs/development/libraries/libsamplerate/default.nix | 9 +++++---- pkgs/misc/tex/texlive/default.nix | 1 - 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/misc/audio/sox/default.nix b/pkgs/applications/misc/audio/sox/default.nix index 9e72bedfb5a2..e3dcf3ec80c8 100644 --- a/pkgs/applications/misc/audio/sox/default.nix +++ b/pkgs/applications/misc/audio/sox/default.nix @@ -50,9 +50,10 @@ composableDerivation {} { description = "Sample Rate Converter for audio"; homepage = http://www.mega-nerd.com/SRC/index.html; # you can choose one of the following licenses: - license = [ "GPL" - { url=http://www.mega-nerd.com/SRC/libsamplerate-cul.pdf; - name="libsamplerate Commercial Use License"; - } ]; + license = [ + "GPL" + # http://www.mega-nerd.com/SRC/libsamplerate-cul.pdf + "libsamplerate Commercial Use License" + ]; }; } diff --git a/pkgs/development/libraries/libsamplerate/default.nix b/pkgs/development/libraries/libsamplerate/default.nix index aa218f102cdc..a30a2884c6a3 100644 --- a/pkgs/development/libraries/libsamplerate/default.nix +++ b/pkgs/development/libraries/libsamplerate/default.nix @@ -23,9 +23,10 @@ stdenv.mkDerivation { description = "Sample Rate Converter for audio"; homepage = http://www.mega-nerd.com/SRC/index.html; # you can choose one of the following licenses: - license = [ "GPL" - { url=http://www.mega-nerd.com/SRC/libsamplerate-cul.pdf; - name="libsamplerate Commercial Use License"; - } ]; + license = [ + "GPL" + # http://www.mega-nerd.com/SRC/libsamplerate-cul.pdf + "libsamplerate Commercial Use License" + ]; }; } diff --git a/pkgs/misc/tex/texlive/default.nix b/pkgs/misc/tex/texlive/default.nix index 38934facf45c..5c7a5df166fd 100644 --- a/pkgs/misc/tex/texlive/default.nix +++ b/pkgs/misc/tex/texlive/default.nix @@ -76,7 +76,6 @@ rec { name = "texlive-core-2007"; meta = { description = "A TeX distribution"; - srcs = [texmfSrc langTexmfSrc]; }; }