Author: urkud Date: Sat Jan 28 14:39:56 2012 New Revision: 31909 URL: https://nixos.org/websvn/nix/?rev=31909&sc=1
Log: Use meta.platforms Modified: nixpkgs/trunk/pkgs/applications/video/MPlayer/default.nix nixpkgs/trunk/pkgs/development/libraries/aspell/dictionaries.nix nixpkgs/trunk/pkgs/development/tools/build-managers/cmake/default.nix nixpkgs/trunk/pkgs/development/tools/misc/pkgconfig/default.nix nixpkgs/trunk/pkgs/os-specific/linux/wpa_supplicant/default.nix nixpkgs/trunk/pkgs/top-level/all-packages.nix nixpkgs/trunk/pkgs/top-level/release.nix Modified: nixpkgs/trunk/pkgs/applications/video/MPlayer/default.nix ============================================================================== --- nixpkgs/trunk/pkgs/applications/video/MPlayer/default.nix Sat Jan 28 14:37:53 2012 (r31908) +++ nixpkgs/trunk/pkgs/applications/video/MPlayer/default.nix Sat Jan 28 14:39:56 2012 (r31909) @@ -166,5 +166,6 @@ homepage = "http://mplayerhq.hu"; license = "GPL"; maintainers = [ stdenv.lib.maintainers.eelco stdenv.lib.maintainers.urkud ]; + platforms = stdenv.lib.platforms.linux; }; } Modified: nixpkgs/trunk/pkgs/development/libraries/aspell/dictionaries.nix ============================================================================== --- nixpkgs/trunk/pkgs/development/libraries/aspell/dictionaries.nix Sat Jan 28 14:37:53 2012 (r31908) +++ nixpkgs/trunk/pkgs/development/libraries/aspell/dictionaries.nix Sat Jan 28 14:39:56 2012 (r31909) @@ -22,6 +22,7 @@ meta = { description = "Aspell dictionary for ${fullName}"; + platforms = stdenv.lib.platforms.all; }; }; Modified: nixpkgs/trunk/pkgs/development/tools/build-managers/cmake/default.nix ============================================================================== --- nixpkgs/trunk/pkgs/development/tools/build-managers/cmake/default.nix Sat Jan 28 14:37:53 2012 (r31908) +++ nixpkgs/trunk/pkgs/development/tools/build-managers/cmake/default.nix Sat Jan 28 14:39:56 2012 (r31909) @@ -55,7 +55,7 @@ meta = { homepage = http://www.cmake.org/; description = "Cross-Platform Makefile Generator"; - platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.unix; + platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.urkud ]; }; } Modified: nixpkgs/trunk/pkgs/development/tools/misc/pkgconfig/default.nix ============================================================================== --- nixpkgs/trunk/pkgs/development/tools/misc/pkgconfig/default.nix Sat Jan 28 14:37:53 2012 (r31908) +++ nixpkgs/trunk/pkgs/development/tools/misc/pkgconfig/default.nix Sat Jan 28 14:39:56 2012 (r31909) @@ -19,6 +19,7 @@ meta = { description = "A tool that allows packages to find out information about other packages"; homepage = http://pkg-config.freedesktop.org/wiki/; + platforms = stdenv.lib.platforms.all; }; } // (if stdenv.system == "mips64el-linux" then Modified: nixpkgs/trunk/pkgs/os-specific/linux/wpa_supplicant/default.nix ============================================================================== --- nixpkgs/trunk/pkgs/os-specific/linux/wpa_supplicant/default.nix Sat Jan 28 14:37:53 2012 (r31908) +++ nixpkgs/trunk/pkgs/os-specific/linux/wpa_supplicant/default.nix Sat Jan 28 14:39:56 2012 (r31909) @@ -89,5 +89,10 @@ mkdir -pv $out/share/icons cp -av icons/hicolor $out/share/icons ''; + + meta = { + description = "Qt4 wpa_supplicant client"; + inherit (qt4.meta) platforms; + }; }; } Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix ============================================================================== --- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Jan 28 14:37:53 2012 (r31908) +++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Jan 28 14:39:56 2012 (r31909) @@ -3688,11 +3688,11 @@ gtkmathview = callPackage ../development/libraries/gtkmathview { }; - gtkLibs = pkgs.gtkLibs224; + gtkLibs = recurseIntoAttrs pkgs.gtkLibs224; inherit (pkgs.gtkLibs) glib gtk pango cairo gdk_pixbuf; - gtkLibs224 = recurseIntoAttrs (let callPackage = pkgs.newScope pkgs.gtkLibs224; in { + gtkLibs224 = let callPackage = pkgs.newScope pkgs.gtkLibs224; in { glib = callPackage ../development/libraries/glib/2.28.x.nix { }; @@ -3716,7 +3716,7 @@ gob2 = callPackage ../development/tools/misc/gob2 { }; - }); + }; gtkLibs3x = let callPackage = newScope pkgs.gtkLibs3x; in { glib = callPackage ../development/libraries/glib/2.30.x.nix { }; @@ -6264,8 +6264,7 @@ wirelesstools = callPackage ../os-specific/linux/wireless-tools { }; - wpa_supplicant = callPackage ../os-specific/linux/wpa_supplicant { - }; + wpa_supplicant = callPackage ../os-specific/linux/wpa_supplicant { }; wpa_supplicant_gui = pkgs.wpa_supplicant.gui; Modified: nixpkgs/trunk/pkgs/top-level/release.nix ============================================================================== --- nixpkgs/trunk/pkgs/top-level/release.nix Sat Jan 28 14:37:53 2012 (r31908) +++ nixpkgs/trunk/pkgs/top-level/release.nix Sat Jan 28 14:39:56 2012 (r31909) @@ -15,7 +15,6 @@ } // (mapTestOn ((packagesWithMetaPlatform pkgs) // rec { - MPlayer = linux; abcde = linux; alsaUtils = linux; apacheHttpd = linux; @@ -52,12 +51,10 @@ chatzilla = linux; cksfv = all; classpath = linux; - cmake = all; consolekit = linux; coreutils = all; cpio = all; cron = linux; - cups = linux; cvs = linux; db4 = all; ddrescue = linux; @@ -237,7 +234,6 @@ php = linux; pidgin = linux; pinentry = linux; - pkgconfig = all; pltScheme = linux; pmccabe = linux; portmap = linux; @@ -333,7 +329,6 @@ wine = ["i686-linux"]; wireshark = linux; wirelesstools = linux; - wpa_supplicant = linux; wxGTK = linux; x11_ssh_askpass = linux; xchm = linux; @@ -354,20 +349,6 @@ zsh = linux; zsnes = ["i686-linux"]; - aspellDicts = { - de = all; - en = all; - es = all; - fr = all; - nl = all; - ru = all; - }; - - dbus_all = { - libs = linux; - tools = linux; - }; - emacs22Packages = { bbdb = linux; cedet = linux; @@ -391,10 +372,6 @@ gnome_vfs = linux; }; - gtkLibs = { - gtk = linux; - }; - /* haskellPackages_ghc6104 = { ghc = ghcSupported; _______________________________________________ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits