Merge pull request #18059 from dezgeg/release-cleanup

release.nix: Remove obsolete individual per-package jobs

pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix

@@ -3,7 +3,11 @@
 assert unzip != null;
 
 stdenv.mkDerivation {
-  inherit src name postInstall meta;
+  inherit src name postInstall;
   builder = ./builder.sh;
   buildInputs = [unzip];
+
+  meta = meta // {
+    platforms = stdenv.lib.platforms.unix;
+  };
 }

pkgs/development/libraries/glibc/common.nix

@@ -181,6 +181,6 @@ stdenv.mkDerivation ({
     license = lib.licenses.lgpl2Plus;
 
     maintainers = [ lib.maintainers.eelco ];
-    #platforms = lib.platforms.linux;
+    platforms = lib.platforms.linux;
   } // meta;
 })

pkgs/stdenv/generic/default.nix

@@ -274,7 +274,10 @@ let
 
     // rec {
 
-      meta.description = "The default build environment for Unix packages in Nixpkgs";
+      meta = {
+        description = "The default build environment for Unix packages in Nixpkgs";
+        platforms = lib.platforms.all;
+      };
 
       # Utility flags to test the type of platform.
       isDarwin = system == "x86_64-darwin";

pkgs/top-level/all-packages.nix

@@ -8783,6 +8783,9 @@ in
   mesa = mesaDarwinOr (buildEnv {
     name = "mesa-${mesa_noglu.version}";
     paths = [ mesa_noglu.dev mesa_noglu.out mesa_glu ];
+    meta = {
+      platforms = lib.platforms.unix;
+    };
   });
 
   meterbridge = callPackage ../applications/audio/meterbridge { };

pkgs/top-level/release.nix

@@ -85,184 +85,13 @@ let
 
     } // (mapTestOn ((packagePlatforms pkgs) // rec {
 
-      # TODO: most (but possibly not all) of the jobs specified here are unnecessary now that we have release-lib.nix
-      # traversing all packages and looking at their meta.platform attributes. Someone who's better at this than I am
-      # should go through these and kill the ones that are safe to kill.
-      #
-      # <niksnut> note that all that " = linux" stuff in release.nix is legacy, from before we had meta.platforms
-      # <copumpkin> niksnut: so should I just kill all the obsolete jobs in release.nix?
-      # <niksnut> I don't know if they're all covered
-      abcde = linux;
-      aspell = all;
-      atlas = linux;
-      bazaar = linux; # first let sqlite3 work on darwin
-      binutils = linux;
-      bind = linux;
-      bvi = all;
-      cdrkit = linux;
-      classpath = linux;
-      ddrescue = linux;
-      dhcp = linux;
-      dico = linux;
-      diffutils = all;
-      disnix = all;
-      disnixos = linux;
-      DisnixWebService = linux;
-      docbook5 = all;
-      docbook5_xsl = all;
-      docbook_xml_dtd_42 = all;
-      docbook_xml_dtd_43 = all;
-      docbook_xsl = all;
-      dosbox = linux;
-      dovecot = linux;
-      doxygen = linux;
-      drgeo = linux;
-      ejabberd = linux;
-      elinks = linux;
-      eprover = linux;
-      expect = linux;
-      exult = linux;
-      flex = all;
-      fontforge = linux;
-      gajim = linux;
-      gawk = all;
-      gcc = linux;
-      gcj = linux;
-      ghostscript = linux;
-      ghostscriptX = linux;
-      glibc = linux;
-      glibcLocales = linux;
-      glxinfo = linux;
-      gnum4 = all;
-      gnupg = linux;
-      gnuplot = allBut cygwin;
-      gnutls = linux;
-      gogoclient = linux;
-      gphoto2 = linux;
-      gpscorrelate = linux;
-      gqview = gtkSupported;
-      gsl = linux;
-      guile = linux;  # tests fail on Cygwin
-      html-tidy = all;
-      icewm = linux;
-      inkscape = linux;
-      irssi = linux;
-      jnettop = linux;
-      keen4 = ["i686-linux"];
-      lftp = all;
-      libarchive = linux;
-      libtool = all;
-      libtool_2 = all;
-      lout = linux;
-      lsof = linux;
-      ltrace = linux;
-      lynx = linux;
-      lzma = linux;
-      man = linux;
-      man-pages = linux;
-      maxima = linux;
-      mc = linux;
-      mcabber = linux;
-      mcron = linux;
-      mdadm = linux;
-      mercurial = unix;
-      mercurialFull = linux;
-      mesa = mesaPlatforms;
-      mk = linux;
-      mktemp = all;
-      mod_python = linux;
-      mupen64plus = linux;
-      mutt = linux;
-      nano = allBut cygwin;
-      netcat = all;
-      nss_ldap = linux;
-      nssmdns = linux;
-      ocaml = linux;
-      pciutils = linux;
-      pdf2xml = all;
-      php = linux;
-      pltScheme = linux;
-      pmccabe = linux;
-      ppl = all;
-      procps = linux;
-      pygtk = linux;
-      python = allBut cygwin;
-      pythonFull = linux;
-      sbcl = linux;
-      qt3 = linux;
-      qt4_clang = ["i686-linux"];
-      quake3demo = linux;
-      reiserfsprogs = linux;
-      rubber = allBut cygwin;
-      rxvt_unicode = linux;
-      scrot = linux;
-      sdparm = linux;
-      seccure = linux;
-      sgtpuzzles = linux;
-      sloccount = allBut cygwin;
-      spidermonkey = linux;
-      squid = linux;
-      ssmtp = linux;
-      stdenv = all;
-      stlport = linux;
-      superTuxKart = linux;
-      swig = linux;
-      tahoelafs = linux;
-      tangogps = linux;
-      tcl = linux;
-      teeworlds = linux;
-      tightvnc = linux;
-      time = linux;
-      tinycc = linux;
-      uae = linux;
-      viking = linux;
-      vice = linux;
-      vimHugeX = linux;
-      vncrec = linux;
-      vorbis-tools = linux;
-      vsftpd = linux;
-      w3m = all;
-      weechat = linux;
-      wicd = linux;
-      wine = ["i686-linux"];
-      wirelesstools = linux;
-      wxGTK = linux;
-      x11_ssh_askpass = linux;
-      xchm = linux;
-      xfig = x11Supported;
-      xfsprogs = linux;
-      xineUI = linux;
-      xkeyboard_config = linux;
-      xlockmore = linux;
-      xpdf = linux;
-      xscreensaver = linux;
-      xsel = linux;
-      xterm = linux;
-      zdelta = linux;
-      zsh = linux;
-      zsnes = ["i686-linux"];
-
       #emacs24PackagesNg = packagePlatforms pkgs.emacs24PackagesNg;
 
-      gnome = {
-        gnome_panel = linux;
-        metacity = linux;
-        gnome_vfs = linux;
-      };
-
       haskell.compiler = packagePlatforms pkgs.haskell.compiler;
       haskellPackages = packagePlatforms pkgs.haskellPackages;
 
       #rPackages = packagePlatforms pkgs.rPackages;
 
-      strategoPackages = {
-        sdf = linux;
-        strategoxt = linux;
-        javafront = linux;
-        strategoShell = linux ++ darwin;
-        dryad = linux;
-      };
-
       ocamlPackages = { };
 
       perlPackages = { };