Merge remote-tracking branch 'upstream/master' into hardened-stdenv

pkgs/misc/base16/default.nix

@@ -56,6 +56,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/chriskempson/base16";
     license = licenses.mit;
     maintainers = with maintainers; [ garbas ];
+    platforms = with platforms; unix;
   };
 
 }

pkgs/misc/cups/drivers/cups-bjnp/default.nix

@@ -21,5 +21,6 @@ stdenv.mkDerivation rec {
       Canon printer. The design is based on reverse engineering of the protocol.
     '';
     homepage = http://cups-bjnp.sourceforge.net;
+    platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/misc/drivers/foo2zjs/default.nix

@@ -1,51 +1,33 @@
-x@{builderDefsPackage
-  , foomatic_filters, bc, unzip, ghostscript, systemd, vim
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
+{ stdenv, fetchurl, foomatic_filters, bc, unzip, ghostscript, systemd, vim }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="foo2zjs";
-    version="20110210";
-    name="${baseName}-${version}";
-    url="http://www.loegria.net/mirrors/foo2zjs/${name}.tar.gz";
-    hash="0vss8gdbbgxr694xw48rys2qflbnb4sp4gdb1v6z4m9ab97hs5yk";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
+stdenv.mkDerivation rec {
+  name = "foo2zjs-20110210";
+
+  src = fetchurl {
+    url = "http://www.loegria.net/mirrors/foo2zjs/${name}.tar.gz";
+    sha256 = "0vss8gdbbgxr694xw48rys2qflbnb4sp4gdb1v6z4m9ab97hs5yk";
   };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
-
-  phaseNames = ["doPatch" "fixHardcodedPaths" "doMakeDirs" "doMakeInstall" "deployGetWeb"];
+  buildInputs = [ foomatic_filters bc unzip ghostscript systemd vim ];
 
   patches = [ ./no-hardcode-fw.diff ];
 
   makeFlags = [
-      ''PREFIX=$out''
-      ''APPL=$out/share/applications''
-      ''PIXMAPS=$out/share/pixmaps''
-      ''UDEVBIN=$out/bin''
-      ''UDEVDIR=$out/etc/udev/rules.d''
-      ''UDEVD=${systemd.udev.bin}/sbin/udevd''
-      ''LIBUDEVDIR=$out/lib/udev/rules.d''
-      ''USBDIR=$out/etc/hotplug/usb''
-      ''FOODB=$out/share/foomatic/db/source''
-      ''MODEL=$out/share/cups/model''
+    "PREFIX=$(out)"
+    "APPL=$(out)/share/applications"
+    "PIXMAPS=$(out)/share/pixmaps"
+    "UDEVBIN=$(out)/bin"
+    "UDEVDIR=$(out)/etc/udev/rules.d"
+    "UDEVD=${systemd.udev.bin}/sbin/udevd"
+    "LIBUDEVDIR=$(out)/lib/udev/rules.d"
+    "USBDIR=$(out)/etc/hotplug/usb"
+    "FOODB=$(out)/share/foomatic/db/source"
+    "MODEL=$(out)/share/cups/model"
   ];
 
   installFlags = [ "install-hotplug" ];
 
-  fixHardcodedPaths = a.fullDepEntry ''
+  postPatch = ''
     touch all-test
     sed -e "/BASENAME=/iPATH=$out/bin:$PATH" -i *-wrapper *-wrapper.in
     sed -e "s@PREFIX=/usr@PREFIX=$out@" -i *-wrapper{,.in}
@@ -55,28 +37,25 @@ rec {
     sed -e "s@/etc/hotplug/usb@$out&@" -i *rules*
     sed -e "s@/usr@$out@g" -i hplj1020.desktop
     sed -e "/PRINTERID=/s@=.*@=$out/bin/usb_printerid@" -i hplj1000
-  '' ["doPatch" "minInit"];
+  '';
 
-  doMakeDirs = a.fullDepEntry ''
+  preInstall = ''
     mkdir -pv $out/{etc/udev/rules.d,lib/udev/rules.d,etc/hotplug/usb}
     mkdir -pv $out/share/foomatic/db/source/{opt,printer,driver}
     mkdir -pv $out/share/cups/model
     mkdir -pv $out/share/{applications,pixmaps}
-  '' ["minInit"];
 
-  deployGetWeb = a.fullDepEntry ''
     mkdir -pv "$out/bin"
     cp -v getweb arm2hpdl "$out/bin"
-  '' ["minInit"];
-      
-  meta = {
+  '';
+
+  meta = with stdenv.lib; {
     description = "ZjStream printer drivers";
-    maintainers = with a.lib.maintainers;
+    maintainers = with maintainers;
     [
       raskin urkud
     ];
-    platforms = with a.lib.platforms;
-      linux;
-    license = a.lib.licenses.gpl2Plus;
+    platforms = platforms.linux;
+    license = licenses.gpl2Plus;
   };
-}) x
+}

pkgs/misc/drivers/gutenprint/bin.nix

@@ -63,5 +63,6 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Some additional CUPS drivers including Canon drivers";
+    platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/misc/drivers/moltengamepad/default.nix

@@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
     description = "Flexible Linux input device translator, geared for gamepads";
     license = licenses.mit;
     maintainers = [ maintainers.ebzzry ];
+    platforms = platforms.linux;
   };
 
 }

pkgs/misc/drivers/xboxdrv/default.nix

@@ -22,6 +22,7 @@ in stdenv.mkDerivation {
     description = "Xbox/Xbox360 (and more) gamepad driver for Linux that works in userspace";
     license = licenses.gpl3Plus;
     maintainers = [ maintainers.fuuzetsu ];
+    platforms = platforms.linux;
   };
 
 }

pkgs/misc/emulators/atari++/default.nix

@@ -23,6 +23,7 @@ stdenv.mkDerivation rec{
       (Linux, Solaris, Irix).
     '';
     maintainers = [ maintainers.AndersonTorres ];
-    license = licenses.gpl2Plus;    
-  };    
+    license = licenses.gpl2Plus;
+    platforms = stdenv.lib.platforms.linux;
+  };
 }

pkgs/misc/emulators/atari800/default.nix

@@ -27,6 +27,7 @@ stdenv.mkDerivation rec{
       other systems supported by the SDL library.
     '';
     maintainers = [ maintainers.AndersonTorres ];
-    license = licenses.gpl2Plus;    
-  };    
+    license = licenses.gpl2Plus;
+    platforms = stdenv.lib.platforms.linux;
+  };
 }

pkgs/misc/emulators/dlx/default.nix

@@ -24,5 +24,6 @@ stdenv.mkDerivation {
     homepage = "http://www.davidviner.com/dlx.php";
     description = "DLX Simulator";
     license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/misc/emulators/dosbox/default.nix

@@ -39,5 +39,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.dosbox.com/;
     description = "A DOS emulator";
+    platforms = stdenv.lib.platforms.unix;
   };
 }

pkgs/misc/emulators/emulationstation/default.nix

@@ -24,5 +24,6 @@ stdenv.mkDerivation rec {
     homepage = "http://emulationstation.org";
     maintainers = [ stdenv.lib.maintainers.edwtjo ];
     license = stdenv.lib.licenses.mit;
+    platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/misc/emulators/fakenes/default.nix

@@ -24,5 +24,6 @@ stdenv.mkDerivation {
     homepage = http://fakenes.sourceforge.net/;
     license = stdenv.lib.licenses.gpl2Plus;
     description = "Portable Open Source NES Emulator";
+    platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/misc/emulators/fceux/default.nix

@@ -30,5 +30,6 @@ stdenv.mkDerivation {
     description = "A Nintendo Entertainment System (NES) Emulator";
     license = stdenv.lib.licenses.gpl2;
     homepage = http://www.fceux.com/;
+    platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/misc/emulators/fs-uae/default.nix

@@ -31,6 +31,7 @@ stdenv.mkDerivation rec{
     license = licenses.gpl2Plus;
     homepage = http://fs-uae.net;
     maintainers = [ maintainers.AndersonTorres ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
 # TODO: testing and Python GUI support

pkgs/misc/emulators/mgba/default.nix

@@ -37,5 +37,6 @@ stdenv.mkDerivation rec {
     '';
     license = licenses.mpl20;
     maintainers = with maintainers; [ MP2E AndersonTorres ];
+    platforms = with platforms; linux;
   };
 }

pkgs/misc/emulators/mupen64plus/default.nix

@@ -31,5 +31,6 @@ stdenv.mkDerivation {
     license = stdenv.lib.licenses.gpl2Plus;
     homepage = http://code.google.com/p/mupen64plus;
     maintainers = [ stdenv.lib.maintainers.sander ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/misc/emulators/retroarch/wrapper.nix

@@ -30,7 +30,7 @@ stdenv.mkDerivation {
   preferLocalBuild = true;
 
   meta = with retroarch.meta; {
-    inherit license homepage;
+    inherit license homepage platforms maintainers;
     description = description
                   + " (with cores: "
                   + lib.concatStrings (lib.intersperse ", " (map (x: ""+x.name) cores))

pkgs/misc/emulators/retrofe/default.nix

@@ -73,5 +73,6 @@ stdenv.mkDerivation rec {
     homepage = http://retrofe.com;
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ hrdinka ];
+    platforms = with platforms; linux;
   };
 }

pkgs/misc/emulators/snes9x-gtk/default.nix

@@ -22,9 +22,15 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A portable, freeware Super Nintendo Entertainment System (SNES) emulator";
-    longDescription = "Snes9x is a portable, freeware Super Nintendo Entertainment System (SNES) emulator. It basically allows you to play most games designed for the SNES and Super Famicom Nintendo game systems on your PC or Workstation; which includes some real gems that were only ever released in Japan.";
+    longDescription = ''
+      Snes9x is a portable, freeware Super Nintendo Entertainment System (SNES)
+      emulator. It basically allows you to play most games designed for the SNES
+      and Super Famicom Nintendo game systems on your PC or Workstation; which
+      includes some real gems that were only ever released in Japan.
+    '';
     license = stdenv.lib.licenses.lgpl2;
     maintainers = [ stdenv.lib.maintainers.qknight ];
     homepage = http://www.snes9x.com/;
+    platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/misc/emulators/uae/default.nix

@@ -19,5 +19,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl2Plus;
     homepage = http://web.archive.org/web/20130901222855/http://www.amigaemulator.org/;
     maintainers = [ stdenv.lib.maintainers.sander ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/misc/emulators/vbam/default.nix

@@ -55,5 +55,6 @@ stdenv.mkDerivation {
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.lassulus ];
     homepage = http://vba-m.com/;
+    platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/misc/emulators/vice/default.nix

@@ -40,5 +40,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.viceteam.org;
     license = stdenv.lib.licenses.gpl2Plus;
     maintainers = [ stdenv.lib.maintainers.sander ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/misc/emulators/wine/winetricks.nix

@@ -25,5 +25,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.lgpl21;
     homepage = http://code.google.com/p/winetricks/;
     maintainers = with stdenv.lib.maintainers; [ the-kenny ];
+    platforms = with stdenv.lib.platforms; linux;
   };
 }

pkgs/misc/emulators/zsnes/default.nix

@@ -70,5 +70,6 @@ in stdenv.mkDerivation {
     license = stdenv.lib.licenses.gpl2Plus;
     maintainers = [ stdenv.lib.maintainers.sander ];
     homepage = http://www.zsnes.com;
+    platforms = stdenv.lib.platforms.unix;
   };
 }

pkgs/misc/gnuk/generic.nix

@@ -48,5 +48,6 @@ stdenv.mkDerivation {
     description = "An implementation of USB cryptographic token for gpg";
     license = licenses.gpl3;
     maintainers = with maintainers; [ wkennington ];
+    platforms = with platforms; linux;
   };
 }

pkgs/misc/phabricator/default.nix

@@ -25,4 +25,8 @@ stdenv.mkDerivation rec {
     cp -R ${srcArcanist} $out/arcanist
     cp -R ${srcPhabricator} $out/phabricator
   '';
+
+  meta = {
+    platforms = stdenv.lib.platforms.unix;
+  };
 }

pkgs/misc/screensavers/rss-glx/default.nix

@@ -21,5 +21,6 @@ stdenv.mkDerivation rec {
       original collection, plus a few others.
     '';
     license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/misc/talkfilters/default.nix

@@ -18,6 +18,7 @@ stdenv.mkDerivation {
     homepage = "http://http://www.hyperrealm.com/${name}";
     license = stdenv.lib.licenses.gpl2;
     maintainers = with stdenv.lib.maintainers; [ ikervagyok ];
+    platforms = with stdenv.lib.platforms; unix;
   };
 }
 

pkgs/misc/themes/albatross/default.nix

@@ -22,5 +22,6 @@ stdenv.mkDerivation rec {
     description = "A desktop Suite for Xfce";
     homepage = http://shimmerproject.org/our-projects/albatross/;
     license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.unix;
   };
 }

pkgs/misc/themes/blackbird/default.nix

@@ -21,5 +21,6 @@ stdenv.mkDerivation rec {
     homepage = http://github.com/shimmerproject/Blackbird;
     license = with stdenv.lib.licenses; [ gpl2Plus cc-by-nc-sa-30 ];
     maintainers = [ stdenv.lib.maintainers.romildo ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/misc/themes/flat-plat/default.nix

@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "flat-plat-gtk-theme-eba3be5";
+
+  src = fetchFromGitHub {
+    owner = "nana-4";
+    repo = "Flat-Plat";
+    rev = "eba3be5eafd1140e1edb8b02411edb2f6c78b0ca";
+    sha256 = "0vfdnrxspdwg4jr025dwjmdcrqnblhlw666v5b7qhkxymibp5j7h";
+  };
+
+  dontBuild = true;
+
+  installPhase = ''
+    mkdir -p $out/share/themes
+    rm .gitignore COPYING README.md
+    cp -r . $out/share/themes
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A Material Design-like flat theme for GTK3, GTK2, and GNOME Shell";
+    homepage = https://github.com/nana-4/Flat-Plat;
+    licence = licenses.gpl2;
+    maintainers = [ maintainers.mounium ];
+    platforms = platforms.all;
+  };
+}
+

pkgs/misc/themes/greybird/default.nix

@@ -29,5 +29,6 @@ stdenv.mkDerivation rec {
     homepage = http://shimmerproject.org/our-projects/greybird/;
     license = with stdenv.lib.licenses; [ gpl2Plus cc-by-nc-sa-30 ];
     maintainers = [ stdenv.lib.maintainers.romildo ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/misc/themes/orion/default.nix

@@ -20,5 +20,6 @@ stdenv.mkDerivation {
   meta = {
     homepage = https://github.com/shimmerproject/Orion;
     license = stdenv.lib.licenses.gpl3Plus;
+    platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/misc/urbit/default.nix

@@ -39,5 +39,6 @@ stdenv.mkDerivation rec {
     homepage = http://urbit.org;
     license = licenses.mit;
     maintainers = with maintainers; [ mudri ];
+    platforms = with platforms; linux;
   };
 }