pkgs/applications: rename name to pname&version part 2

10 files changed, 177 insertions, 53 deletions

diff --git a/pkgs/applications/video/cinelerra/default.nix b/pkgs/applications/video/cinelerra/default.nix
index 75d3cdbcc667b..35138ec739f5a 100644
--- a/pkgs/applications/video/cinelerra/default.nix
+++ b/pkgs/applications/video/cinelerra/default.nix
@@ -1,13 +1,50 @@
-{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool
-, pkg-config, 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, file, nasm, perl
-, fontconfig, intltool }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoconf
+, automake
+, libtool
+, pkg-config
+, 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
+, file
+, nasm
+, perl
+, fontconfig
+, intltool
+}:
 
 stdenv.mkDerivation {
-  name = "cinelerra-cv-2021-02-14";
+  pname = "cinelerra-cv";
+  version = "unstable-2021-02-14";
 
   src = fetchFromGitHub {
     owner = "cinelerra-cv-team";
@@ -30,12 +67,37 @@ stdenv.mkDerivation {
 
   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
+    [
+      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
diff --git a/pkgs/applications/video/coriander/default.nix b/pkgs/applications/video/coriander/default.nix
index 09289840030e9..7f57c79c5fe54 100644
--- a/pkgs/applications/video/coriander/default.nix
+++ b/pkgs/applications/video/coriander/default.nix
@@ -1,11 +1,24 @@
-{ lib, stdenv, fetchurl, pkg-config, glib, gtk2, libgnomeui, libXv, libraw1394, libdc1394
-, SDL, automake, GConf }:
+{ lib
+, stdenv
+, fetchurl
+, pkg-config
+, glib
+, gtk2
+, libgnomeui
+, libXv
+, libraw1394
+, libdc1394
+, SDL
+, automake
+, GConf
+}:
 
-stdenv.mkDerivation {
-  name = "coriander-2.0.1";
+stdenv.mkDerivation rec {
+  pname = "coriander";
+  version = "2.0.1";
 
   src = fetchurl {
-    url = "http://damien.douxchamps.net/ieee1394/coriander/archives/coriander-2.0.1.tar.gz";
+    url = "http://damien.douxchamps.net/ieee1394/coriander/archives/coriander-${version}.tar.gz";
     sha256 = "0l6hpfgy5r4yardilmdrggsnn1fbfww516sk5a90g1740cd435x5";
   };
 
@@ -20,7 +33,7 @@ stdenv.mkDerivation {
     homepage = "https://damien.douxchamps.net/ieee1394/coriander/";
     description = "GUI for controlling a Digital Camera through the IEEE1394 bus";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [viric];
+    maintainers = with lib.maintainers; [ viric ];
     platforms = with lib.platforms; linux;
   };
 }
diff --git a/pkgs/applications/video/dvdauthor/default.nix b/pkgs/applications/video/dvdauthor/default.nix
index 502c4c69c3f84..941b0808886e5 100644
--- a/pkgs/applications/video/dvdauthor/default.nix
+++ b/pkgs/applications/video/dvdauthor/default.nix
@@ -1,15 +1,28 @@
-{ lib, stdenv, fetchurl, imagemagick, libdvdread, libxml2, freetype, fribidi, libpng, zlib, pkg-config
-, flex, bison }:
+{ lib
+, stdenv
+, fetchurl
+, imagemagick
+, libdvdread
+, libxml2
+, freetype
+, fribidi
+, libpng
+, zlib
+, pkg-config
+, flex
+, bison
+}:
 
 stdenv.mkDerivation rec {
-  name = "dvdauthor-0.7.1";
+  pname = "dvdauthor";
+  version = "0.7.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/dvdauthor/${name}.tar.gz";
+    url = "mirror://sourceforge/dvdauthor/dvdauthor-${version}.tar.gz";
     sha256 = "1s8zqlim0s3hk5sbdsilip3qqh0yv05l1jwx49d9rsy614dv27sh";
   };
 
-  buildInputs = [ libpng freetype libdvdread libxml2 zlib fribidi imagemagick flex bison];
+  buildInputs = [ libpng freetype libdvdread libxml2 zlib fribidi imagemagick flex bison ];
   nativeBuildInputs = [ pkg-config ];
 
   patches = [
diff --git a/pkgs/applications/video/lxdvdrip/default.nix b/pkgs/applications/video/lxdvdrip/default.nix
index 6a10aca398cb7..60604a4b8abf2 100644
--- a/pkgs/applications/video/lxdvdrip/default.nix
+++ b/pkgs/applications/video/lxdvdrip/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, libdvdread }:
 
 stdenv.mkDerivation rec {
-  name = "lxdvdrip-1.76";
+  pname = "lxdvdrip";
+  version = "1.76";
 
   src = fetchurl {
-    url = "mirror://sourceforge/lxdvdrip/${name}.tgz";
+    url = "mirror://sourceforge/lxdvdrip/lxdvdrip-${version}.tgz";
     sha256 = "0vgslc7dapfrbgslnaicc8bggdccyrvcgjv1dwi19qswhh7jkzj6";
   };
 
diff --git a/pkgs/applications/video/ogmtools/default.nix b/pkgs/applications/video/ogmtools/default.nix
index aa0f2404ab805..9f7e08a9ddf4a 100644
--- a/pkgs/applications/video/ogmtools/default.nix
+++ b/pkgs/applications/video/ogmtools/default.nix
@@ -1,14 +1,15 @@
 { lib, stdenv, fetchurl, libogg, libvorbis, libdvdread }:
 
 stdenv.mkDerivation rec {
-  name = "ogmtools-1.5";
+  pname = "ogmtools";
+  version = "1.5";
 
   src = fetchurl {
-    url = "https://www.bunkus.org/videotools/ogmtools/${name}.tar.bz2";
+    url = "https://www.bunkus.org/videotools/ogmtools/ogmtools-${version}.tar.bz2";
     sha256 = "1spx81p5wf59ksl3r3gvf78d77sh7gj8a6lw773iv67bphfivmn8";
   };
 
-  buildInputs = [libogg libvorbis libdvdread];
+  buildInputs = [ libogg libvorbis libdvdread ];
 
   meta = {
     description = "Tools for modifying and inspecting OGG media streams";
diff --git a/pkgs/applications/video/omxplayer/default.nix b/pkgs/applications/video/omxplayer/default.nix
index 3fe3dcf454a1f..f24a9914d0f59 100644
--- a/pkgs/applications/video/omxplayer/default.nix
+++ b/pkgs/applications/video/omxplayer/default.nix
@@ -1,17 +1,24 @@
-{ lib, stdenv, fetchurl
-, raspberrypifw, pcre, boost, freetype, zlib
+{ lib
+, stdenv
+, fetchurl
+, raspberrypifw
+, pcre
+, boost
+, freetype
+, zlib
 }:
 
 let
   ffmpeg = stdenv.mkDerivation rec {
-    name = "ffmpeg-1.1.3";
+    pname = "ffmpeg";
+    version = "1.1.3";
 
     src = fetchurl {
-      url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
+      url = "http://www.ffmpeg.org/releases/ffmpeg-${version}.tar.bz2";
       sha256 = "03s1zsprz5p6gjgwwqcf7b6cvzwwid6l8k7bamx9i0f1iwkgdm0j";
     };
 
-    configurePlatforms = [];
+    configurePlatforms = [ ];
     configureFlags = [
       "--arch=${stdenv.hostPlatform.parsed.cpu.name}"
     ] ++ lib.optionals stdenv.hostPlatform.isAarch32 [
@@ -61,10 +68,11 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  name = "omxplayer-20130328-fbee325dc2";
+  pname = "omxplayer";
+  version = "20130328-fbee325dc2";
   src = fetchurl {
     url = "https://github.com/huceke/omxplayer/tarball/fbee325dc2";
-    name = "${name}.tar.gz";
+    name = "omxplayer-${version}.tar.gz";
     sha256 = "0fkvv8il7ffqxki2gp8cxa5shh6sz9jsy5vv3f4025g4gss6afkg";
   };
   patchPhase = ''
diff --git a/pkgs/applications/video/subdl/default.nix b/pkgs/applications/video/subdl/default.nix
index e115fbcdd04de..1f0b424831b82 100644
--- a/pkgs/applications/video/subdl/default.nix
+++ b/pkgs/applications/video/subdl/default.nix
@@ -1,7 +1,8 @@
 { lib, stdenv, fetchFromGitHub, python3 }:
 
 stdenv.mkDerivation {
-  name = "subdl-0.0pre.2017.11.06";
+  pname = "subdl";
+  version = "0.0pre.2017.11.06";
 
   src = fetchFromGitHub {
     owner = "alexanderwink";
diff --git a/pkgs/applications/video/uvccapture/default.nix b/pkgs/applications/video/uvccapture/default.nix
index 70c3baa0b811d..be0a7fcd2416e 100644
--- a/pkgs/applications/video/uvccapture/default.nix
+++ b/pkgs/applications/video/uvccapture/default.nix
@@ -8,11 +8,12 @@ let
 
 in
 
-stdenv.mkDerivation {
-  name = "uvccapture-0.5";
+stdenv.mkDerivation rec {
+  pname = "uvccapture";
+  version = "0.5";
 
   src = fetchurl {
-    url = "mirror://debian/pool/main/u/uvccapture/uvccapture_0.5.orig.tar.gz";
+    url = "mirror://debian/pool/main/u/uvccapture/uvccapture_${version}.orig.tar.gz";
     sha256 = "1b3akkcmr3brbf93akr8xi20w8zqf2g0qfq928500wy04qi6jqpi";
   };
 
diff --git a/pkgs/applications/video/xawtv/default.nix b/pkgs/applications/video/xawtv/default.nix
index b046fbebaa260..d52feb8a66b05 100644
--- a/pkgs/applications/video/xawtv/default.nix
+++ b/pkgs/applications/video/xawtv/default.nix
@@ -1,4 +1,5 @@
-{ lib, stdenv
+{ lib
+, stdenv
 , fetchurl
 , ncurses
 , libjpeg
@@ -19,10 +20,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "xawtv-3.107";
+  pname = "xawtv";
+  version = "3.107";
 
   src = fetchurl {
-    url = "https://linuxtv.org/downloads/xawtv/${name}.tar.bz2";
+    url = "https://linuxtv.org/downloads/xawtv/xawtv-${version}.tar.bz2";
     sha256 = "055p0wia0xsj073l8mg4ifa6m81dmv6p45qyh99brramq5iylfy5";
   };
 
diff --git a/pkgs/applications/video/xvidcap/default.nix b/pkgs/applications/video/xvidcap/default.nix
index e0cca04098786..06dc6bb465cc2 100644
--- a/pkgs/applications/video/xvidcap/default.nix
+++ b/pkgs/applications/video/xvidcap/default.nix
@@ -1,12 +1,26 @@
-{ lib, stdenv, fetchurl, perlPackages, pkg-config, gtk2
-, scrollkeeper, libglade, libXmu, libX11, libXext, gettext
-, lame, libXfixes, libXdamage }:
+{ lib
+, stdenv
+, fetchurl
+, perlPackages
+, pkg-config
+, gtk2
+, scrollkeeper
+, libglade
+, libXmu
+, libX11
+, libXext
+, gettext
+, lame
+, libXfixes
+, libXdamage
+}:
 
-stdenv.mkDerivation {
-  name = "xvidcap-1.1.7";
+stdenv.mkDerivation rec {
+  pname = "xvidcap";
+  version = "1.1.7";
 
   src = fetchurl {
-    url = "mirror://sourceforge/xvidcap/xvidcap-1.1.7.tar.gz";
+    url = "mirror://sourceforge/xvidcap/xvidcap-${version}.tar.gz";
     sha256 = "0p8rhpyhxgy37crf1xk1046z4p663jg7ww776jw92pld3s024ihm";
   };
 
@@ -14,8 +28,16 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
-    gtk2 scrollkeeper
-    libglade libXmu gettext lame libXdamage libXfixes libXext libX11
+    gtk2
+    scrollkeeper
+    libglade
+    libXmu
+    gettext
+    lame
+    libXdamage
+    libXfixes
+    libXext
+    libX11
   ] ++ (with perlPackages; [ perl XMLParser ]);
 
   # !!! don't know why this is necessary
@@ -24,7 +46,7 @@ stdenv.mkDerivation {
   meta = with lib; {
     description = "Screencast video catpuring tool";
     homepage = "http://xvidcap.sourceforge.net/";
-    license = lib.licenses.gpl2;
+    license = licenses.gpl2;
     platforms = platforms.linux;
   };
 }