Merge pull request #145178 from SuperSandro2000/applications

Applications
2021-11-09 21:33:41 +01:00 · 2021-11-09 21:33:41 +01:00 · 9a9ef88b8c
commit 9a9ef88b8c
parent 841b23bd1d b1c5442ceb
14 changed files with 124 additions and 114 deletions
--- a/pkgs/applications/audio/aumix/default.nix
+++ b/pkgs/applications/audio/aumix/default.nix
@ -4,12 +4,10 @@
 , gettext
 , ncurses
 , gtkGUI ? false
-, pkg-config ? null
-, gtk2 ? null
+, pkg-config
+, gtk2
 }:

-assert gtkGUI -> pkg-config != null && gtk2 != null;
-
 stdenv.mkDerivation rec {
  pname = "aumix";
  version = "2.9.1";
@ -22,16 +20,15 @@ stdenv.mkDerivation rec {
  buildInputs = [ gettext ncurses ]
    ++ lib.optionals gtkGUI [ pkg-config gtk2 ];

-  meta = {
+  meta = with lib; {
    description = "Audio mixer for X and the console";
    longDescription = ''
      Aumix adjusts an audio mixer from X, the console, a terminal,
      the command line or a script.
    '';
    homepage = "http://www.jpj.net/~trevor/aumix.html";
-    license = lib.licenses.gpl2Plus;
-
-    maintainers = [ ];
-    platforms = lib.platforms.linux;
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ ];
+    platforms = platforms.linux;
  };
 }
--- a/pkgs/applications/editors/emacs/elisp-packages/session-management-for-emacs/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/session-management-for-emacs/default.nix
@ -16,12 +16,14 @@ stdenv.mkDerivation rec {
    cp lisp/*.el "$out/share/emacs/site-lisp/"
  '';

-  meta = {
-    # installation: add to your ~/.emacs
-    #  (require 'session)
-    #  (add-hook 'after-init-hook 'session-initialize)
+  meta = with lib; {
+    /* installation: add to your ~/.emacs
+      (require 'session)
+      (add-hook 'after-init-hook 'session-initialize)
+    */
    description = "Small session management for emacs";
    homepage = "http://emacs-session.sourceforge.net/";
-    license = "GPL";
+    license = license.gpl;
+    maintainers = with maintainers; [ ];
  };
 }
--- a/pkgs/applications/graphics/gpicview/default.nix
+++ b/pkgs/applications/graphics/gpicview/default.nix
@ -16,6 +16,10 @@ stdenv.mkDerivation rec {
    })
  ];

+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [ intltool gtk2 ];
+
  meta = with lib; {
    description = "A simple and fast image viewer for X";
    homepage = "http://lxde.sourceforge.net/gpicview/";
@ -24,7 +28,4 @@ stdenv.mkDerivation rec {
    maintainers = with maintainers; [ lovek323 ];
    platforms = platforms.unix;
  };
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ intltool gtk2 ];
 }
--- a/pkgs/applications/graphics/gqview/default.nix
+++ b/pkgs/applications/graphics/gqview/default.nix
@ -1,10 +1,5 @@
 { lib, stdenv, fetchurl, pkg-config, gtk2, libpng }:

-assert pkg-config != null && gtk2 != null && libpng != null;
-# Note that we cannot just copy gtk's png attribute, since gtk might
-# not be linked against png.
-# !!! assert libpng == gtk2.libpng;
-
 stdenv.mkDerivation rec {
  pname = "gqview";
  version = "2.1.5";
@ -15,6 +10,7 @@ stdenv.mkDerivation rec {
  };

  nativeBuildInputs = [ pkg-config ];
+
  buildInputs = [ gtk2 libpng ];

  hardeningDisable = [ "format" ];
@ -26,5 +22,6 @@ stdenv.mkDerivation rec {
    homepage = "http://gqview.sourceforge.net";
    license = licenses.gpl2;
    platforms = platforms.unix;
+    maintainers = with maintainers; [ ];
  };
 }
--- a/pkgs/applications/graphics/sane/xsane.nix
+++ b/pkgs/applications/graphics/sane/xsane.nix
@ -7,13 +7,11 @@
 , gtk2
 , pkg-config
 , libpng
-, libusb-compat-0_1 ? null
+, libusb-compat-0_1
 , gimpSupport ? false
-, gimp ? null
+, gimp
 }:

-assert gimpSupport -> gimp != null;
-
 stdenv.mkDerivation rec {
  pname = "xsane";
  version = "0.999";
@ -29,14 +27,15 @@ stdenv.mkDerivation rec {
  '';

  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ libpng sane-backends sane-frontends libX11 gtk2 ]
-    ++ (if libusb-compat-0_1 != null then [ libusb-compat-0_1 ] else [ ])
+
+  buildInputs = [ libpng libusb-compat-0_1 sane-backends sane-frontends libX11 gtk2 ]
    ++ lib.optional gimpSupport gimp;

-  meta = {
+  meta = with lib; {
    homepage = "http://www.sane-project.org/";
    description = "Graphical scanning frontend for sane";
-    license = lib.licenses.gpl2Plus;
-    platforms = with lib.platforms; linux;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ ];
  };
 }
--- a/pkgs/applications/radio/kalibrate-rtl/default.nix
+++ b/pkgs/applications/radio/kalibrate-rtl/default.nix
@ -1,18 +1,18 @@
-{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, fftw, rtl-sdr, libusb1 }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, fftw, rtl-sdr, libusb1 }:

 stdenv.mkDerivation {
  pname = "kalibrate-rtl";
-  version = "2013-12-14";
+  version = "unstable-2013-12-14";

-  # There are no tags/releases, so use the latest commit from git master.
-  # Currently, the latest commit is from 2013-12-14.
-  src = fetchgit {
-    url = "https://github.com/steve-m/kalibrate-rtl.git";
+  src = fetchFromGitHub {
+    owner = "steve-m";
+    repo = "kalibrate-rtl";
    rev = "aae11c8a8dc79692a94ccfee39ba01e8c8c05d38";
    sha256 = "1spbfflkqnw9s8317ppsf7b1nnkicqsmaqsnz1zf8i49ix70i6kn";
  };

  nativeBuildInputs = [ autoreconfHook pkg-config ];
+
  buildInputs = [ fftw rtl-sdr libusb1 ];

  meta = with lib; {
@ -27,6 +27,6 @@ stdenv.mkDerivation {
    homepage = "https://github.com/steve-m/kalibrate-rtl";
    license = licenses.bsd2;
    platforms = platforms.linux;
-    maintainers = [ maintainers.bjornfor ];
+    maintainers = with maintainers; [ bjornfor ];
  };
 }
--- a/pkgs/applications/science/logic/prover9/default.nix
+++ b/pkgs/applications/science/logic/prover9/default.nix
@ -11,7 +11,7 @@ stdenv.mkDerivation {

  hardeningDisable = [ "format" ];

-  patchPhase = ''
+  postPatch = ''
    RM=$(type -tp rm)
    MV=$(type -tp mv)
    CP=$(type -tp cp)
@ -31,16 +31,16 @@ stdenv.mkDerivation {
    cp bin/* $out/bin
  '';

-  meta = {
+  meta = with lib; {
    homepage = "https://www.cs.unm.edu/~mccune/mace4/";
-    license = "GPL";
+    license = licenses.gpl1;
    description = "Automated theorem prover for first-order and equational logic";
    longDescription = ''
      Prover9 is a resolution/paramodulation automated theorem prover
      for first-order and equational logic. Prover9 is a successor of
      the Otter Prover. This is the LADR command-line version.
    '';
-    platforms = lib.platforms.linux;
-    maintainers = [ ];
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ ];
  };
 }
--- a/pkgs/applications/science/logic/redprl/default.nix
+++ b/pkgs/applications/science/logic/redprl/default.nix
@ -1,25 +1,32 @@
-{ lib, stdenv, fetchgit, mlton }:
+{ lib, stdenv, fetchFromGitHub, mlton }:
+
 stdenv.mkDerivation {
  pname = "redprl";
  version = "unstable-2017-03-28";

-  src = fetchgit {
-    url = "https://github.com/RedPRL/sml-redprl.git";
+  src = fetchFromGitHub {
+    owner = "RedPRL";
+    repo = "sml-redprl";
    rev = "bdf027de732e4a8d10f9f954389dfff0c822f18b";
-    sha256 = "0cihwnd78d3ksxp6mppifm7xpi3fsii5mixvicajy87ggw8z305c";
    fetchSubmodules = true;
+    sha256 = "0cihwnd78d3ksxp6mppifm7xpi3fsii5mixvicajy87ggw8z305c";
  };
+
  buildInputs = [ mlton ];
-  patchPhase = ''
+
+  postPatch = ''
    patchShebangs ./script/
  '';
+
  buildPhase = ''
    ./script/mlton.sh
  '';
+
  installPhase = ''
    mkdir -p $out/bin
    mv ./bin/redprl $out/bin
  '';
+
  meta = with lib; {
    description = "A proof assistant for Nominal Computational Type Theory";
    homepage = "http://www.redprl.org/";
--- a/pkgs/applications/terminal-emulators/mrxvt/default.nix
+++ b/pkgs/applications/terminal-emulators/mrxvt/default.nix
@ -16,8 +16,12 @@ stdenv.mkDerivation rec {
  pname = "mrxvt";
  version = "0.5.4";

-  buildInputs =
-    [ libX11 libXft libXi xorgproto libSM libICE freetype pkg-config which ];
+  src = fetchurl {
+    url = "mirror://sourceforge/materm/mrxvt-${version}.tar.gz";
+    sha256 = "1mqhmnlz32lvld9rc6c1hyz7gjw4anwf39yhbsjkikcgj1das0zl";
+  };
+
+  buildInputs = [ libX11 libXft libXi xorgproto libSM libICE freetype pkg-config which ];

  configureFlags = [
    "--with-x"
@ -34,11 +38,6 @@ stdenv.mkDerivation rec {
    NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype.dev}/include/freetype2";
  '';

-  src = fetchurl {
-    url = "mirror://sourceforge/materm/mrxvt-${version}.tar.gz";
-    sha256 = "1mqhmnlz32lvld9rc6c1hyz7gjw4anwf39yhbsjkikcgj1das0zl";
-  };
-
  meta = with lib; {
    description = "Lightweight multitabbed feature-rich X11 terminal emulator";
    longDescription = "
@ -48,6 +47,7 @@ stdenv.mkDerivation rec {
    homepage = "https://sourceforge.net/projects/materm";
    license = licenses.gpl2;
    platforms = platforms.linux;
+    maintainers = with maintainers; [ ];
    knownVulnerabilities = [
      "Usage of ANSI escape sequences causes unexpected newline-termination, leading to unexpected command execution (https://www.openwall.com/lists/oss-security/2021/05/17/1)"
    ];
--- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-theme-switch/default.nix
+++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-theme-switch/default.nix
@ -1,16 +1,15 @@
 { lib, stdenv, fetchFromGitHub }:

 stdenv.mkDerivation rec {
-  rev = "cfcbcc3dd5a5b09a3fec0f6a1fea95f4a36a48c4";
  pname = "urxvt-theme-switch";
-  version = "unstable-2014-12-21_rev${builtins.substring 0 1 rev}";
+  version = "unstable-2014-12-21";

  dontPatchShebangs = true;

  src = fetchFromGitHub {
    owner = "felixr";
    repo = "urxvt-theme-switch";
-    inherit rev;
+    rev = "cfcbcc3dd5a5b09a3fec0f6a1fea95f4a36a48c4";
    sha256 = "0x27m1vdqprn3lqpwgxvffill7prmaj6j9rhgvkvi13mzl5wmlli";
  };

@ -25,6 +24,6 @@ stdenv.mkDerivation rec {
    homepage = "https://github.com/felixr/urxvt-theme-switch";
    license = "CCBYNC";
    maintainers = with maintainers; [ ];
-    platforms = with platforms; unix;
+    platforms = platforms.unix;
  };
 }
--- a/pkgs/applications/video/cinelerra/default.nix
+++ b/pkgs/applications/video/cinelerra/default.nix
@ -63,45 +63,46 @@ stdenv.mkDerivation {
  preBuild = ''
    make -C cinelerra versioninfo.h
  '';
+
  enableParallelBuilding = true;

  nativeBuildInputs = [ automake autoconf libtool pkg-config file intltool ];
-  buildInputs =
-    [
-      faad2
-      faac
-      a52dec
-      alsa-lib
-      fftw
-      lame
-      libavc1394
-      libiec61883
-      libraw1394
-      libsndfile
-      libvorbis
-      libogg
-      libjpeg
-      libtiff
-      freetype
-      mjpegtools
-      x264
-      gettext
-      openexr
-      libXext
-      libXxf86vm
-      libXv
-      libXi
-      libX11
-      libXft
-      xorgproto
-      libtheora
-      libpng
-      libdv
-      libuuid
-      nasm
-      perl
-      fontconfig
-    ];
+
+  buildInputs = [
+    faad2
+    faac
+    a52dec
+    alsa-lib
+    fftw
+    lame
+    libavc1394
+    libiec61883
+    libraw1394
+    libsndfile
+    libvorbis
+    libogg
+    libjpeg
+    libtiff
+    freetype
+    mjpegtools
+    x264
+    gettext
+    openexr
+    libXext
+    libXxf86vm
+    libXv
+    libXi
+    libX11
+    libXft
+    xorgproto
+    libtheora
+    libpng
+    libdv
+    libuuid
+    nasm
+    perl
+    fontconfig
+  ];

  meta = with lib; {
    description = "Professional video editing and compositing environment (community version)";
--- a/pkgs/applications/video/omxplayer/default.nix
+++ b/pkgs/applications/video/omxplayer/default.nix
@ -1,5 +1,6 @@
 { lib
 , stdenv
+, fetchFromGitHub
 , fetchurl
 , raspberrypifw
 , pcre
@ -69,26 +70,31 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "omxplayer";
-  version = "20130328-fbee325dc2";
-  src = fetchurl {
-    url = "https://github.com/huceke/omxplayer/tarball/fbee325dc2";
-    name = "omxplayer-${version}.tar.gz";
+  version = "unstable-2013-03-28";
+
+  src = fetchFromGitHub {
+    owner = "huceke";
+    repo = "omxplayer";
+    rev = "fbee325dc20441138d04d8d2022ad85956302e97";
    sha256 = "0fkvv8il7ffqxki2gp8cxa5shh6sz9jsy5vv3f4025g4gss6afkg";
  };
-  patchPhase = ''
+
+  postPatch = ''
    sed -i 1d Makefile
    export INCLUDES="-I${raspberrypifw}/include/interface/vcos/pthreads -I${raspberrypifw}/include/interface/vmcs_host/linux/"
  '';
+
  installPhase = ''
    mkdir -p $out/bin
    cp omxplayer.bin $out/bin
  '';
+
  buildInputs = [ raspberrypifw ffmpeg pcre boost freetype zlib ];

-  meta = {
+  meta = with lib; {
    homepage = "https://github.com/huceke/omxplayer";
    description = "Commandline OMX player for the Raspberry Pi";
-    license = lib.licenses.gpl2Plus;
-    platforms = lib.platforms.arm;
+    license = licenses.gpl2Plus;
+    platforms = platforms.arm;
  };
 }
--- a/pkgs/applications/video/subdl/default.nix
+++ b/pkgs/applications/video/subdl/default.nix
@ -2,7 +2,7 @@

 stdenv.mkDerivation {
  pname = "subdl";
-  version = "0.0pre.2017.11.06";
+  version = "unstable-2017-11.06";

  src = fetchFromGitHub {
    owner = "alexanderwink";
@ -11,6 +11,12 @@ stdenv.mkDerivation {
    sha256 = "0kmk5ck1j49q4ww0lvas2767kwnzhkq0vdwkmjypdx5zkxz73fn8";
  };

+  buildInputs = [ python3 ];
+
+  installPhase = ''
+    install -vD subdl $out/bin/subdl
+  '';
+
  meta = {
    homepage = "https://github.com/alexanderwink/subdl";
    description = "A command-line tool to download subtitles from opensubtitles.org";
@ -18,10 +24,4 @@ stdenv.mkDerivation {
    license = lib.licenses.gpl3;
    maintainers = [ lib.maintainers.exfalso ];
  };
-
-  buildInputs = [ python3 ];
-
-  installPhase = ''
-    install -vD subdl $out/bin/subdl
-  '';
 }
--- a/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix
+++ b/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix
@ -1,11 +1,12 @@
-{ lib, stdenv, fetchgit }:
+{ lib, stdenv, fetchFromGitHub }:

 stdenv.mkDerivation {
  pname = "win-pvdrivers";
  version = "unstable-2015-07-01";

-  src = fetchgit {
-    url = "https://github.com/ts468/win-pvdrivers";
+  src = fetchFromGitHub {
+    owner = "ts468";
+    repo = "win-pvdrivers";
    rev = "3054d645fc3ee182bea3e97ff01869f01cc3637a";
    sha256 = "6232ca2b7c9af874abbcb9262faf2c74c819727ed2eb64599c790879df535106";
  };
@ -23,7 +24,7 @@ stdenv.mkDerivation {
  meta = with lib; {
    description = "Xen Subproject: Windows PV Driver";
    homepage = "http://xenproject.org/downloads/windows-pv-drivers.html";
-    maintainers = [ maintainers.tstrobel ];
+    maintainers = with maintainers; [ tstrobel ];
    platforms = platforms.linux;
    license = licenses.bsd3;
  };