summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2013-01-06 22:30:23 +0100
committerEelco Dolstra <e.dolstra@tudelft.nl>2013-01-06 22:31:16 +0100
commit1e9e2cb2bbd96b323e4c51e7525b2e01dc3e57ad (patch)
tree13fd872413492cc855ab0feaeee9a92632b4fe8a
parent53efca69468acf8c73f9e9185c02d970b21c611b (diff)
downloadnixlib-1e9e2cb2bbd96b323e4c51e7525b2e01dc3e57ad.tar
nixlib-1e9e2cb2bbd96b323e4c51e7525b2e01dc3e57ad.tar.gz
nixlib-1e9e2cb2bbd96b323e4c51e7525b2e01dc3e57ad.tar.bz2
nixlib-1e9e2cb2bbd96b323e4c51e7525b2e01dc3e57ad.tar.lz
nixlib-1e9e2cb2bbd96b323e4c51e7525b2e01dc3e57ad.tar.xz
nixlib-1e9e2cb2bbd96b323e4c51e7525b2e01dc3e57ad.tar.zst
nixlib-1e9e2cb2bbd96b323e4c51e7525b2e01dc3e57ad.zip
samba, imagemagick: Add missing meta info
-rw-r--r--pkgs/applications/graphics/ImageMagick/default.nix4
-rw-r--r--pkgs/servers/samba/default.nix6
-rw-r--r--pkgs/top-level/all-packages.nix2
-rw-r--r--pkgs/top-level/release.nix2
4 files changed, 10 insertions, 4 deletions
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index cbab2da551a9..d66db51a4de3 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -46,6 +46,8 @@ stdenv.mkDerivation rec {
     '' else "";
 
   meta = {
-    homepage = http://www.imagemagick.org;
+    homepage = http://www.imagemagick.org/;
+    description = "A software suite to create, edit, compose, or convert bitmap images";
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/servers/samba/default.nix b/pkgs/servers/samba/default.nix
index 08c53182dd5d..059b1c1a217d 100644
--- a/pkgs/servers/samba/default.nix
+++ b/pkgs/servers/samba/default.nix
@@ -75,4 +75,10 @@ stdenv.mkDerivation rec {
       cp ../examples/LDAP/samba.schema $out/etc/openldap/schema
     '' # */
     + stdenv.lib.optionalString (configDir == "") "touch $out/lib/smb.conf";
+
+  meta = {
+    homepage = http://www.samba.org/;
+    description = "The standard Windows interoperability suite of programs for Linux and Unix";
+    platforms = stdenv.lib.platforms.linux;
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 65a59e08f7a0..b16846cf0762 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6758,7 +6758,7 @@ let
 
   cuneiform = builderDefsPackage (import ../tools/graphics/cuneiform) {
     inherit cmake patchelf;
-    imagemagick=imagemagick;
+    imagemagick = imagemagick;
   };
 
   cvs = callPackage ../applications/version-management/cvs { };
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index e4efb2cbd9cc..75d5ab72d62b 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -146,7 +146,6 @@ with (import ./release-lib.nix);
   icewm = linux;
   idutils = all;
   ifplugd = linux;
-  imagemagick = allBut "i686-cygwin";
   impressive = linux;
   inetutils = linux;
   inkscape = linux;
@@ -252,7 +251,6 @@ with (import ./release-lib.nix);
   rubber = allBut "i686-cygwin";
   ruby = all;
   rxvt_unicode = linux;
-  samba = linux;
   screen = linux ++ darwin;
   scrot = linux;
   sdparm = linux;