Merge pull request #145101 from SuperSandro2000/misc

pkgs/applications/misc/adobe-reader/default.nix

@@ -13,28 +13,21 @@
 , gdk-pixbuf-xlib
 }:
 
-assert stdenv.hostPlatform.system == "i686-linux";
-
-let
-  baseVersion = "9.5.5";
-in
 stdenv.mkDerivation rec {
   pname = "adobe-reader";
-  version = "${baseVersion}-1";
+  version = "9.5.5";
 
+  # TODO: convert to phases
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = "http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/${baseVersion}/enu/AdbeRdr${version}_i486linux_enu.tar.bz2";
+    url = "http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/${version}/enu/AdbeRdr${version}-1_i486linux_enu.tar.bz2";
     sha256 = "0h35misxrqkl5zlmmvray1bqf4ywczkm89n9qw7d9arqbg3aj3pf";
   };
 
   # !!! Adobe Reader contains copies of OpenSSL, libcurl, and libicu.
-  # We should probably remove those and use the regular Nixpkgs
-  # versions.
-
-  libPath = lib.makeLibraryPath
-    [ stdenv.cc.cc libX11 zlib libxml2 cups pango atk gtk2 glib gdk-pixbuf gdk-pixbuf-xlib ];
+  # We should probably remove those and use the regular Nixpkgs versions.
+  libPath = lib.makeLibraryPath [ stdenv.cc.cc libX11 zlib libxml2 cups pango atk gtk2 glib gdk-pixbuf gdk-pixbuf-xlib ];
 
   passthru.mozillaPlugin = "/libexec/adobe-reader/Browser/intellinux";
 
@@ -46,5 +39,6 @@ stdenv.mkDerivation rec {
       "Numerous unresolved vulnerabilities"
       "See: https://www.cvedetails.com/product/497/Adobe-Acrobat-Reader.html?vendor_id=53"
     ];
+    platforms = [ "i686-linux" ];
   };
 }

pkgs/applications/misc/audio/sox/default.nix

@@ -5,36 +5,34 @@
 , pkg-config
 , CoreAudio
 , enableAlsa ? true
-, alsa-lib ? null
+, alsa-lib
 , enableLibao ? true
-, libao ? null
+, libao
 , enableLame ? config.sox.enableLame or false
-, lame ? null
+, lame
 , enableLibmad ? true
-, libmad ? null
+, libmad
 , enableLibogg ? true
-, libogg ? null
-, libvorbis ? null
+, libogg
+, libvorbis
 , enableOpusfile ? true
-, opusfile ? null
+, opusfile
 , enableFLAC ? true
-, flac ? null
+, flac
 , enablePNG ? true
-, libpng ? null
+, libpng
 , enableLibsndfile ? true
-, libsndfile ? null
+, libsndfile
 , enableWavpack ? true
-, wavpack ? null
+, wavpack
   # amrnb and amrwb are unfree, disabled by default
 , enableAMR ? false
-, amrnb ? null
-, amrwb ? null
-, enableLibpulseaudio ? true
-, libpulseaudio ? null
+, amrnb
+, amrwb
+, enableLibpulseaudio ? stdenv.isLinux
+, libpulseaudio
 }:
 
-with lib;
-
 stdenv.mkDerivation rec {
   pname = "sox";
   version = "14.4.2";
@@ -45,30 +43,30 @@ stdenv.mkDerivation rec {
   };
 
   # configure.ac uses pkg-config only to locate libopusfile
-  nativeBuildInputs = optional enableOpusfile pkg-config;
+  nativeBuildInputs = lib.optional enableOpusfile pkg-config;
 
   patches = [ ./0001-musl-rewind-pipe-workaround.patch ];
 
   buildInputs =
-    optional (enableAlsa && stdenv.isLinux) alsa-lib ++
-    optional enableLibao libao ++
-    optional enableLame lame ++
-    optional enableLibmad libmad ++
-    optionals enableLibogg [ libogg libvorbis ] ++
-    optional enableOpusfile opusfile ++
-    optional enableFLAC flac ++
-    optional enablePNG libpng ++
-    optional enableLibsndfile libsndfile ++
-    optional enableWavpack wavpack ++
-    optionals enableAMR [ amrnb amrwb ] ++
-    optional enableLibpulseaudio libpulseaudio ++
-    optional (stdenv.isDarwin) CoreAudio;
+    lib.optional (enableAlsa && stdenv.isLinux) alsa-lib
+    ++ lib.optional enableLibao libao
+    ++ lib.optional enableLame lame
+    ++ lib.optional enableLibmad libmad
+    ++ lib.optionals enableLibogg [ libogg libvorbis ]
+    ++ lib.optional enableOpusfile opusfile
+    ++ lib.optional enableFLAC flac
+    ++ lib.optional enablePNG libpng
+    ++ lib.optional enableLibsndfile libsndfile
+    ++ lib.optional enableWavpack wavpack
+    ++ lib.optionals enableAMR [ amrnb amrwb ]
+    ++ lib.optional enableLibpulseaudio libpulseaudio
+    ++ lib.optional stdenv.isDarwin CoreAudio;
 
-  meta = {
+  meta = with lib; {
     description = "Sample Rate Converter for audio";
     homepage = "http://sox.sourceforge.net/";
-    maintainers = [ lib.maintainers.marcweber ];
-    license = if enableAMR then lib.licenses.unfree else lib.licenses.gpl2Plus;
-    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+    maintainers = with maintainers; [ marcweber ];
+    license = if enableAMR then licenses.unfree else licenses.gpl2Plus;
+    platforms = platforms.unix;
   };
 }

pkgs/applications/misc/garmin-plugin/default.nix

@@ -1,28 +1,39 @@
-{ lib, stdenv, fetchurl, garmintools, libgcrypt, libusb-compat-0_1, pkg-config, tinyxml, zlib }:
+{ lib, stdenv, fetchFromGitHub, garmintools, libgcrypt, libusb-compat-0_1, pkg-config, tinyxml, zlib }:
+
 stdenv.mkDerivation rec {
   pname = "garmin-plugin";
   version = "0.3.26";
 
-  src = fetchurl {
-    url = "https://github.com/adiesner/GarminPlugin/archive/V${version}.tar.gz";
-    sha256 = "15gads1fj4sj970m5960dgnhys41ksi4cm53ldkf67wn8dc9i4k0";
+  src = fetchFromGitHub {
+    owner = "adiesner";
+    repo = "GarminPlugin";
+    rev = "V${version}";
+    sha256 = "sha256-l0WAbEsQl1dCADf5gTepYjsA1rQCJMLcrTxRR4PfUus=";
   };
-  sourceRoot = "GarminPlugin-${version}/src";
+
+  preConfigure = ''
+    cd src
+  '';
+
   nativeBuildInputs = [ pkg-config ];
+
   buildInputs = [ garmintools libusb-compat-0_1 libgcrypt tinyxml zlib ];
+
   configureFlags = [
     "--with-libgcrypt-prefix=${libgcrypt.dev}"
     "--with-garmintools-incdir=${garmintools}/include"
     "--with-garmintools-libdir=${garmintools}/lib"
   ];
+
   installPhase = ''
     mkdir -p $out/lib/mozilla/plugins
     cp npGarminPlugin.so $out/lib/mozilla/plugins
   '';
-  meta = {
-    homepage = "http://www.andreas-diesner.de/garminplugin";
-    license = lib.licenses.gpl3;
-    maintainers = [ ];
-    platforms = lib.platforms.linux;
+
+  meta = with lib; {
+    homepage = "https://adiesner.github.io/GarminPlugin/";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ ];
+    platforms = platforms.linux;
   };
 }

pkgs/applications/misc/gkrellm/default.nix

@@ -15,8 +15,6 @@
 , wrapGAppsHook
 }:
 
-with lib;
-
 stdenv.mkDerivation rec {
   pname = "gkrellm";
   version = "2.3.11";
@@ -28,7 +26,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ copyDesktopItems pkg-config which wrapGAppsHook ];
   buildInputs = [ gettext glib gtk2 libX11 libSM libICE ]
-    ++ optionals stdenv.isDarwin [ IOKit ];
+    ++ lib.optionals stdenv.isDarwin [ IOKit ];
 
   hardeningDisable = [ "format" ];
 
@@ -62,7 +60,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  meta = {
+  meta = with lib; {
     description = "Themeable process stack of system monitors";
     longDescription = ''
       GKrellM is a single process stack of system monitors which

pkgs/applications/misc/jigdo/default.nix

@@ -4,7 +4,6 @@ stdenv.mkDerivation rec {
   pname = "jigdo";
   version = "0.7.3";
 
-  # Debian sources
   src = fetchurl {
     url = "http://ftp.de.debian.org/debian/pool/main/j/jigdo/jigdo_${version}.orig.tar.gz";
     sha256 = "1qvqzgzb0dzq82fa1ffs6hyij655rajnfwkljk1y0mnkygnha1xv";
@@ -22,10 +21,11 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--without-libdb" ];
 
-  meta = {
+  meta = with lib; {
     description = "Download utility that can fetch files from several sources simultaneously";
-    homepage = "http://atterer.net/jigdo/";
-    license = lib.licenses.gpl2;
-    platforms = lib.platforms.unix;
+    homepage = "http://atterer.org/jigdo/";
+    license = licenses.gpl2Only;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ ];
   };
 }

pkgs/applications/misc/loxodo/default.nix

@@ -1,19 +1,17 @@
-{ lib, python27Packages, fetchgit }:
-let
-  py = python27Packages;
-  python = py.python;
-in
-py.buildPythonApplication {
-  pname = "loxodo";
-  version = "0.20150124";
+{ lib, python2, fetchFromGitHub }:
 
-  src = fetchgit {
-    url = "https://github.com/sommer/loxodo.git";
+python2.pkgs.buildPythonApplication {
+  pname = "loxodo";
+  version = "unstable-2015-01-24";
+
+  src = fetchFromGitHub {
+    owner = "sommer";
+    repo = "loxodo";
     rev = "6c56efb4511fd6f645ad0f8eb3deafc8071c5795";
     sha256 = "1cg0dfcv57ps54f1a0ksib7hgkrbdi9q699w302xyyfyvjcb5dd2";
   };
 
-  propagatedBuildInputs = with py; [ wxPython ];
+  propagatedBuildInputs = with python2.pkgs; [ wxPython ];
 
   postInstall = ''
     mv $out/bin/loxodo.py $out/bin/loxodo
@@ -22,7 +20,7 @@ py.buildPythonApplication {
     [Desktop Entry]
     Type=Application
     Exec=$out/bin/loxodo
-    Icon=$out/lib/${python.libPrefix}/site-packages/resources/loxodo-icon.png
+    Icon=$out/lib/${python2.libPrefix}/site-packages/resources/loxodo-icon.png
     Name=Loxodo
     GenericName=Password Vault
     Categories=Application;Other;
@@ -34,5 +32,6 @@ py.buildPythonApplication {
     homepage = "https://www.christoph-sommer.de/loxodo/";
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
+    maintainers = with maintainers; [ ];
   };
 }

pkgs/applications/misc/metar/default.nix

@@ -1,11 +1,12 @@
-{ lib, stdenv, fetchgit, curl }:
+{ lib, stdenv, fetchFromGitHub, curl }:
 
 stdenv.mkDerivation {
   pname = "metar";
-  version = "20161013.1";
+  version = "unstable-2017-02-17";
 
-  src = fetchgit {
-    url = "https://github.com/keesL/metar.git";
+  src = fetchFromGitHub {
+    owner = "keesL";
+    repo = "metar";
     rev = "20e9ca69faea330f6c2493b6829131c24cb55147";
     sha256 = "1fgrlnpasqf1ihh9y6zy6mzzybqx0lxvh7gmv03rjdb55dr42dxj";
   };
@@ -14,8 +15,6 @@ stdenv.mkDerivation {
 
   meta = with lib; {
     homepage = "https://github.com/keesL/metar";
-    license = licenses.gpl2;
-    maintainers = [ maintainers.zalakain ];
     description = "Downloads weather reports and optionally decodes them";
     longDescription = ''
       METAR reports are meteorogical weather reports for aviation. Metar is a small
@@ -27,5 +26,7 @@ stdenv.mkDerivation {
       more work in the area of clouds need to be done, as support for Cumulus or
       Cumulunimbus is not yet decoded.
     '';
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ zalakain ];
   };
 }

pkgs/applications/misc/procmail/default.nix

@@ -4,6 +4,11 @@ stdenv.mkDerivation rec {
   pname = "procmail";
   version = "3.22";
 
+  src = fetchurl {
+    url = "ftp://ftp.fu-berlin.de/pub/unix/mail/procmail/procmail-${version}.tar.gz";
+    sha256 = "05z1c803n5cppkcq99vkyd5myff904lf9sdgynfqngfk9nrpaz08";
+  };
+
   patches = [
     ./CVE-2014-3618.patch
     (fetchurl {
@@ -16,20 +21,16 @@ stdenv.mkDerivation rec {
   # getline is defined differently in glibc now. So rename it.
   # Without the .PHONY target "make install" won't install anything on Darwin.
   postPatch = ''
-        sed -e "s%^RM.*$%#%" -i Makefile
-        sed -e "s%^BASENAME.*%\BASENAME=$out%" -i Makefile
-        sed -e "s%^LIBS=.*%LIBS=-lm%" -i Makefile
-        sed -e "s%getline%thisgetline%g" -i src/*.c src/*.h
-        sed -e "3i\
+    sed -i Makefile \
+      -e "s%^RM.*$%#%" \
+      -e "s%^BASENAME.*%\BASENAME=$out%" \
+      -e "s%^LIBS=.*%LIBS=-lm%"
+    sed -e "s%getline%thisgetline%g" -i src/*.c src/*.h
+    sed -e "3i\
     .PHONY: install
     " -i Makefile
   '';
 
-  src = fetchurl {
-    url = "ftp://ftp.fu-berlin.de/pub/unix/mail/procmail/procmail-${version}.tar.gz";
-    sha256 = "05z1c803n5cppkcq99vkyd5myff904lf9sdgynfqngfk9nrpaz08";
-  };
-
   meta = with lib; {
     description = "Mail processing and filtering utility";
     homepage = "http://www.procmail.org/";

pkgs/applications/misc/rofi-menugen/default.nix

@@ -1,26 +1,28 @@
 { lib, stdenv, fetchFromGitHub, rofi, gnused }:
 
 stdenv.mkDerivation rec {
-  rev = "168efd2608fdb88b1aff3e0244bda8402169f207";
   pname = "rofi-menugen";
-  version = "unstable-2015-12-28-${builtins.substring 0 7 rev}";
+  version = "unstable-2015-12-28";
 
   src = fetchFromGitHub {
     owner = "octotep";
     repo = "menugen";
-    inherit rev;
+    rev = "168efd2608fdb88b1aff3e0244bda8402169f207";
     sha256 = "09fk9i6crw772qlc5zld35pcff1jq4jcag0syial2q000fbpjx5m";
   };
-  patchPhase = ''
+
+  postPatch = ''
     sed -i -e "s|menugenbase|$out/bin/rofi-menugenbase|" menugen
     sed -i -e "s|rofi |${rofi}/bin/rofi |" menugen
     sed -i -e "s|sed |${gnused}/bin/sed |" menugenbase
   '';
+
   installPhase = ''
     mkdir -p $out/bin
     cp menugen $out/bin/rofi-menugen
     cp menugenbase $out/bin/rofi-menugenbase
   '';
+
   meta = with lib; {
     description = "Generates menu based applications using rofi";
     homepage = "https://github.com/octotep/menugen";

pkgs/applications/misc/stag/default.nix

@@ -1,11 +1,12 @@
-{ lib, stdenv, fetchgit, curses }:
+{ lib, stdenv, fetchFromGitHub, curses }:
 
 stdenv.mkDerivation {
   pname = "stag";
   version = "1.0";
 
-  src = fetchgit {
-    url = "https://github.com/seenaburns/stag.git";
+  src = fetchFromGitHub {
+    owner = "seenaburns";
+    repo = "stag";
     rev = "90e2964959ea8242349250640d24cee3d1966ad6";
     sha256 = "1yrzjhcwrxrxq5jj695wvpgb0pz047m88yq5n5ymkcw5qr78fy1v";
   };
@@ -16,11 +17,11 @@ stdenv.mkDerivation {
     make install PREFIX=$out
   '';
 
-  meta = {
+  meta = with lib; {
     homepage = "https://github.com/seenaburns/stag";
     description = "Terminal streaming bar graph passed through stdin";
-    license = lib.licenses.bsdOriginal;
-    maintainers = [ lib.maintainers.matthiasbeyer ];
-    platforms = lib.platforms.unix;
+    license = licenses.bsdOriginal;
+    maintainers = with maintainers; [ matthiasbeyer ];
+    platforms = platforms.unix;
   };
 }

pkgs/applications/misc/xfontsel/default.nix

@@ -3,6 +3,7 @@
 # That is why this expression is not inside pkgs.xorg
 
 { lib, stdenv, fetchurl, makeWrapper, libX11, pkg-config, libXaw }:
+
 stdenv.mkDerivation rec {
   pname = "xfontsel";
   version = "1.0.6";
@@ -13,6 +14,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkg-config makeWrapper ];
+
   buildInputs = [ libX11 libXaw ];
 
   # Without this, it gets Xmu as a dependency, but without rpath entry
@@ -27,11 +29,11 @@ stdenv.mkDerivation rec {
       --set XAPPLRESDIR $out/share/X11/app-defaults
   '';
 
-  meta = {
+  meta = with lib; {
     homepage = "https://www.x.org/";
     description = "Allows testing the fonts available in an X server";
-    license = lib.licenses.free;
-    maintainers = with lib.maintainers; [ viric ];
-    platforms = with lib.platforms; linux ++ darwin;
+    license = licenses.free;
+    maintainers = with maintainers; [ viric ];
+    platforms = platforms.unix;
   };
 }

pkgs/applications/misc/xxkb/default.nix

@@ -14,9 +14,6 @@
 , pkg-config
 }:
 
-assert svgSupport ->
-librsvg != null && glib != null && gdk-pixbuf != null && pkg-config != null;
-
 stdenv.mkDerivation rec {
   pname = "xxkb";
   version = "1.11.1";
@@ -27,6 +24,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ imake gccmakedep ];
+
   buildInputs = [
     libX11
     libXt
@@ -49,11 +47,11 @@ stdenv.mkDerivation rec {
 
   installTargets = [ "install" "install.man" ];
 
-  meta = {
+  meta = with lib; {
     description = "A keyboard layout indicator and switcher";
     homepage = "http://xxkb.sourceforge.net/";
-    license = lib.licenses.artistic2;
-    maintainers = with lib.maintainers; [ rasendubi ];
-    platforms = lib.platforms.linux;
+    license = licenses.artistic2;
+    maintainers = with maintainers; [ rasendubi ];
+    platforms = platforms.linux;
   };
 }