treewide: move "unstable" from version to pname

according to the current rules https://nixos.org/manual/nixpkgs/stable/#sec-package-naming Also - fixed some version formatting - changed `name` to `pname` - fixed some style issues - in some cases it was needed to replace `${pname}` with the actual string, so it does not contain "unstable" - in tmux-plugins, the `pluginName` was changed - in one case (ppx_tools) the "unstable" part was lost
NixOS · Jan 22, 2021 · e19569f · e19569f
1 parent 153ad8b
commit e19569f
Show file tree

Hide file tree

Showing 370 changed files with 854 additions and 843 deletions.
diff --git a/pkgs/applications/audio/ams/default.nix b/pkgs/applications/audio/ams/default.nix
@@ -12,8 +12,8 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ams";
-  version = "unstable-2019-04-27";
+  pname = "ams-unstable";
+  version = "2019-04-27";
 
   src = fetchgit {
     url = "https://git.code.sf.net/p/alsamodular/ams.git";

diff --git a/pkgs/applications/audio/artyFX/default.nix b/pkgs/applications/audio/artyFX/default.nix
@@ -1,9 +1,9 @@
 { lib, stdenv, fetchFromGitHub , cairomm, cmake, libjack2, libpthreadstubs, libXdmcp, libxshmfence, libsndfile, lv2, ntk, pkg-config }:
 
 stdenv.mkDerivation rec {
-  pname = "artyFX";
+  pname = "artyFX-unstable";
   # Fix build with lv2 1.18: https://github.com/openAVproductions/openAV-ArtyFX/pull/41/commits/492587461b50d140455aa3c98d915eb8673bebf0
-  version = "unstable-2020-04-28";
+  version = "2020-04-28";
 
   src = fetchFromGitHub {
     owner = "openAVproductions";

diff --git a/pkgs/applications/audio/cheesecutter/default.nix b/pkgs/applications/audio/cheesecutter/default.nix
@@ -7,8 +7,8 @@
 , SDL
 }:
 stdenv.mkDerivation rec {
-  pname = "cheesecutter";
-  version = "unstable-2020-04-03";
+  pname = "cheesecutter-unstable";
+  version = "2020-04-03";
 
   src = fetchFromGitHub {
     owner = "theyamo";

diff --git a/pkgs/applications/audio/csound/csound-manual/default.nix b/pkgs/applications/audio/csound/csound-manual/default.nix
@@ -5,8 +5,8 @@
 }:
 
 stdenv.mkDerivation {
-  pname = "csound-manual";
-  version = "unstable-2019-02-22";
+  pname = "csound-manual-unstable";
+  version = "2019-02-22";
 
   src = fetchFromGitHub {
     owner = "csound";

diff --git a/pkgs/applications/audio/deadbeef/plugins/lyricbar.nix b/pkgs/applications/audio/deadbeef/plugins/lyricbar.nix
@@ -1,8 +1,8 @@
 { lib, stdenv, fetchFromGitHub, pkg-config, deadbeef, gtkmm3, libxmlxx3 }:
 
 stdenv.mkDerivation {
-  pname = "deadbeef-lyricbar-plugin";
-  version = "unstable-2019-01-29";
+  pname = "deadbeef-lyricbar-plugin-unstable";
+  version = "2019-01-29";
 
   src = fetchFromGitHub {
     owner = "C0rn3j";

diff --git a/pkgs/applications/audio/dsf2flac/default.nix b/pkgs/applications/audio/dsf2flac/default.nix
@@ -2,12 +2,12 @@
 , taglib, zlib }:
 
 stdenv.mkDerivation rec {
-  pname = "dsf2flac";
-  version = "unstable-2018-01-02";
+  pname = "dsf2flac-unstable";
+  version = "2018-01-02";
 
   src = fetchFromGitHub {
     owner = "hank";
-    repo = pname;
+    repo = "dsf2flac";
     rev = "b0cf5aa6ddc60df9bbfeed25548e443c99f5cb16";
     sha256 = "15j5f82v7lgs0fkgyyynl82cb1rsxyr9vw3bpzra63nacbi9g8lc";
   };

diff --git a/pkgs/applications/audio/ensemble-chorus/default.nix b/pkgs/applications/audio/ensemble-chorus/default.nix
@@ -1,8 +1,8 @@
 { lib, stdenv, fetchFromGitHub, fltk, alsaLib, freetype, libXrandr, libXinerama, libXcursor, lv2, libjack2, cmake, pkg-config }:
 
 stdenv.mkDerivation rec {
-  pname = "ensemble-chorus";
-  version = "unstable-15-02-2019";
+  pname = "ensemble-chorus-unstable";
+  version = "15-02-2019";
 
   src = fetchFromGitHub {
     owner = "jpcima";

diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix
@@ -20,7 +20,7 @@ with lib.strings;
 
 let
 
-  version = "unstable-2020-08-27";
+  version = "2020-08-27";
 
   src = fetchFromGitHub {
     owner = "grame-cncm";
@@ -40,7 +40,7 @@ let
 
   faust = stdenv.mkDerivation {
 
-    pname = "faust";
+    pname = "faust-unstable";
     inherit version;
 
     inherit src;

diff --git a/pkgs/applications/audio/faust/faustlive.nix b/pkgs/applications/audio/faust/faustlive.nix
@@ -4,8 +4,8 @@
 }:
 
 stdenv.mkDerivation rec {
-  pname = "faustlive";
-  version = "unstable-dev-2020-08-03";
+  pname = "faustlive-unstable";
+  version = "2020-08-03";
   src = fetchFromGitHub {
     owner = "grame-cncm";
     repo = "faustlive";

diff --git a/pkgs/applications/audio/freqtweak/default.nix b/pkgs/applications/audio/freqtweak/default.nix
@@ -1,8 +1,8 @@
 { lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, fftwFloat, libjack2, libsigcxx, libxml2, wxGTK }:
 
 stdenv.mkDerivation rec {
-  pname = "freqtweak";
-  version = "unstable-2019-08-03";
+  pname = "freqtweak-unstable";
+  version = "2019-08-03";
 
   src = fetchFromGitHub {
     owner = "essej";

diff --git a/pkgs/applications/audio/friture/default.nix b/pkgs/applications/audio/friture/default.nix
@@ -3,8 +3,8 @@
 let
   py = python3Packages;
 in py.buildPythonApplication rec {
-  pname = "friture";
-  version = "unstable-2020-02-16";
+  pname = "friture-unstable";
+  version = "2020-02-16";
 
   src = fetchFromGitHub {
     owner = "tlecomte";

diff --git a/pkgs/applications/audio/fverb/default.nix b/pkgs/applications/audio/fverb/default.nix
@@ -4,9 +4,9 @@
 }:
 
 stdenv.mkDerivation rec {
-  pname = "fverb";
+  pname = "fverb-unstable";
   # no release yet: https://github.com/jpcima/fverb/issues/2
-  version = "unstable-2020-06-09";
+  version = "2020-06-09";
 
   src = fetchFromGitHub {
     owner = "jpcima";

diff --git a/pkgs/applications/audio/hivelytracker/default.nix b/pkgs/applications/audio/hivelytracker/default.nix
@@ -11,8 +11,8 @@
 }:
 
 stdenv.mkDerivation rec {
-  pname = "hivelytracker";
-  version = "unstable-2020-08-19";
+  pname = "hivelytracker-unstable";
+  version = "2020-08-19";
 
   src = fetchFromGitHub {
     owner = "pete-gordon";

diff --git a/pkgs/applications/audio/iannix/default.nix b/pkgs/applications/audio/iannix/default.nix
@@ -2,8 +2,8 @@
 }:
 
 mkDerivation rec {
-  pname = "iannix";
-  version = "unstable-2020-12-09";
+  pname = "iannix-unstable";
+  version = "2020-12-09";
 
   src = fetchFromGitHub {
     owner = "iannix";

diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix
@@ -5,9 +5,8 @@
 }:
 
 stdenv.mkDerivation  rec {
-  pname = "ingen";
-  version = "unstable-2019-12-09";
-  name = "${pname}-${version}";
+  pname = "ingen-unstable";
+  version = "2019-12-09";
 
   src = fetchgit {
     url = "https://gitlab.com/drobilla/ingen.git";

diff --git a/pkgs/applications/audio/littlegptracker/default.nix b/pkgs/applications/audio/littlegptracker/default.nix
@@ -7,8 +7,8 @@
 }:
 
 stdenv.mkDerivation rec {
-  pname = "littlegptracker";
-  version = "unstable-2020-11-26";
+  pname = "littlegptracker-unstable";
+  version = "2020-11-26";
 
   src = fetchFromGitHub {
     owner = "Mdashdotdashn";

diff --git a/pkgs/applications/audio/molot-lite/default.nix b/pkgs/applications/audio/molot-lite/default.nix
@@ -1,8 +1,8 @@
 { lib, stdenv, fetchurl, unzip, lv2 }:
 
 stdenv.mkDerivation {
-  pname = "molot-lite";
-  version = "unstable-2014-04-23";
+  pname = "molot-lite-unstable";
+  version = "2014-04-23";
 
   src = fetchurl {
     # fetchzip does not accept urls that do not end with .zip.

diff --git a/pkgs/applications/audio/mooSpace/default.nix b/pkgs/applications/audio/mooSpace/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
 stdenv.mkDerivation rec {
-  pname = "mooSpace";
-  version = "unstable-2020-06-10";
+  pname = "mooSpace-unstable";
+  version = "2020-06-10";
 
   src = fetchFromGitHub {
     owner = "modularev";
@@ -12,18 +12,18 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ faust2jaqt faust2lv2 ];
 
-  patchPhase = "mv ${pname}_faust.dsp ${pname}.dsp";
+  patchPhase = "mv mooSpace_faust.dsp mooSpace.dsp";
 
   buildPhase = ''
-    faust2jaqt -time -vec -t 0 ${pname}.dsp
-    faust2lv2  -time -vec -t 0 -gui ${pname}.dsp
+    faust2jaqt -time -vec -t 0 mooSpace.dsp
+    faust2lv2  -time -vec -t 0 -gui mooSpace.dsp
   '';
 
   installPhase = ''
     mkdir -p $out/bin
-    cp ${pname} $out/bin/
+    cp mooSpace $out/bin/
       mkdir -p $out/lib/lv2
-      cp -r ${pname}.lv2 $out/lib/lv2
+      cp -r mooSpace.lv2 $out/lib/lv2
   '';
 
   meta = {

diff --git a/pkgs/applications/audio/musly/default.nix b/pkgs/applications/audio/musly/default.nix
@@ -1,15 +1,19 @@
 { lib, stdenv, fetchFromGitHub, cmake, eigen, libav }:
 stdenv.mkDerivation {
-  pname = "musly";
-  version = "unstable-2017-04-26";
+  pname = "musly-unstable";
+  version = "2017-04-26";
+
   src = fetchFromGitHub {
     owner = "dominikschnitzer";
     repo = "musly";
     rev = "f911eacbbe0b39ebe87cb37d0caef09632fa40d6";
     sha256 = "1q42wvdwy2pac7bhfraqqj2czw7w2m33ms3ifjl8phm7d87i8825";
   };
+
   nativeBuildInputs = [ cmake ];
+
   buildInputs = [ eigen (libav.override { vaapiSupport = stdenv.isLinux; }) ];
+
   fixupPhase = if stdenv.isDarwin then ''
     install_name_tool -change libmusly.dylib $out/lib/libmusly.dylib $out/bin/musly
     install_name_tool -change libmusly_resample.dylib $out/lib/libmusly_resample.dylib $out/bin/musly

diff --git a/pkgs/applications/audio/pulseaudio-dlna/default.nix b/pkgs/applications/audio/pulseaudio-dlna/default.nix
@@ -18,8 +18,8 @@ let
   zeroconf = pythonPackages.callPackage ./zeroconf.nix { };
 in
 pythonPackages.buildPythonApplication {
-  pname = "pulseaudio-dlna";
-  version = "unstable-2017-11-01";
+  pname = "pulseaudio-dlna-unstable";
+  version = "2017-11-01";
 
   src = fetchFromGitHub {
     owner = "masmu";

diff --git a/pkgs/applications/audio/real_time_config_quick_scan/default.nix b/pkgs/applications/audio/real_time_config_quick_scan/default.nix
@@ -1,8 +1,8 @@
 { lib, stdenv, fetchFromGitHub, perlPackages, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  pname = "realTimeConfigQuickScan";
-  version = "unstable-2020-07-23";
+  pname = "realTimeConfigQuickScan-unstable";
+  version = "2020-07-23";
 
   src = fetchFromGitHub {
     owner  = "raboof";
@@ -18,16 +18,16 @@ stdenv.mkDerivation rec {
   installPhase = ''
     runHook preInstall
     mkdir -p $out/bin
-    mkdir -p $out/share/$pname
-    mkdir -p $out/share/doc/$pname
+    mkdir -p $out/share/realTimeConfigQuickScan
+    mkdir -p $out/share/doc/realTimeConfigQuickScan
     # Install Script Files:
     # *.pm files
     for i in *.pm; do
-    install -Dm 755 "$i" "$out/share/$pname/$i"
+    install -Dm 755 "$i" "$out/share/realTimeConfigQuickScan/$i"
     done
     # Install doc files:
-    install -D COPYING  "$out/share/doc/$pname/COPYING"
-    install -D README.md  "$out/share/doc/$pname/README.md"
+    install -D COPYING  "$out/share/doc/realTimeConfigQuickScan/COPYING"
+    install -D README.md  "$out/share/doc/realTimeConfigQuickScan/README.md"
     # Install Executable scripts:
     install -Dm 755 realTimeConfigQuickScan.pl "$out/bin/realTimeConfigQuickScan"
     install -Dm 755 QuickScan.pl "$out/bin/QuickScan"
@@ -36,9 +36,9 @@ stdenv.mkDerivation rec {
 
   postFixup = ''
     wrapProgram $out/bin/realTimeConfigQuickScan \
-      --set PERL5LIB "$out/share/$pname"
+      --set PERL5LIB "$out/share/realTimeConfigQuickScan"
     wrapProgram $out/bin/QuickScan \
-      --set PERL5LIB "$out/share/$pname:${with perlPackages; makePerlPath [ Tk ]}"
+      --set PERL5LIB "$out/share/realTimeConfigQuickScan:${with perlPackages; makePerlPath [ Tk ]}"
   '';
 
   meta = with lib; {

diff --git a/pkgs/applications/audio/rhvoice/default.nix b/pkgs/applications/audio/rhvoice/default.nix
@@ -2,9 +2,9 @@
 , python, glibmm, libpulseaudio, libao }:
 
 let
-  version = "unstable-2018-02-10";
+  version = "2018-02-10";
 in stdenv.mkDerivation {
-  pname = "rhvoice";
+  pname = "rhvoice-unstable";
   inherit version;
 
   src = fetchFromGitHub {

diff --git a/pkgs/applications/audio/sc68/default.nix b/pkgs/applications/audio/sc68/default.nix
@@ -12,8 +12,8 @@
 }:
 
 stdenv.mkDerivation rec {
-  pname = "sc68";
-  version = "unstable-2020-05-18";
+  pname = "sc68-unstable";
+  version = "2020-05-18";
 
   src = fetchsvn {
     url = "svn://svn.code.sf.net/p/sc68/code/";

diff --git a/pkgs/applications/audio/speech-denoiser/default.nix b/pkgs/applications/audio/speech-denoiser/default.nix
@@ -9,8 +9,8 @@ let
   };
 
   rnnoise-nu = stdenv.mkDerivation {
-    pname = "rnnoise-nu";
-    version = "unstable-07-10-2019";
+    pname = "rnnoise-nu-unstable";
+    version = "07-10-2019";
     src = speech-denoiser-src;
     sourceRoot = "source/rnnoise";
     nativeBuildInputs = [ autoreconfHook ];
@@ -19,8 +19,8 @@ let
   };
 in
 stdenv.mkDerivation  {
-  pname = "speech-denoiser";
-  version = "unstable-07-10-2019";
+  pname = "speech-denoiser-unstable";
+  version = "07-10-2019";
 
   src = speech-denoiser-src;
 

diff --git a/pkgs/applications/audio/spek/default.nix b/pkgs/applications/audio/spek/default.nix
@@ -1,8 +1,8 @@
 { lib, stdenv, fetchFromGitHub, autoreconfHook, intltool, pkg-config, ffmpeg, wxGTK30-gtk3, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  pname = "spek";
-  version = "unstable-2018-12-29";
+  pname = "spek-unstable";
+  version = "2018-12-29";
 
   src = fetchFromGitHub {
     owner = "alexkay";

diff --git a/pkgs/applications/audio/string-machine/default.nix b/pkgs/applications/audio/string-machine/default.nix
@@ -1,8 +1,8 @@
 { lib, stdenv, fetchFromGitHub, boost, cairo, lv2, pkg-config }:
 
 stdenv.mkDerivation rec {
-  pname = "string-machine";
-  version = "unstable-2020-01-20";
+  pname = "string-machine-unstable";
+  version = "2020-01-20";
 
   src = fetchFromGitHub {
     owner = "jpcima";

diff --git a/pkgs/applications/audio/tamgamp.lv2/default.nix b/pkgs/applications/audio/tamgamp.lv2/default.nix
@@ -1,8 +1,8 @@
 { lib, stdenv, fetchFromGitHub, pkg-config, lv2, zita-resampler }:
 
 stdenv.mkDerivation rec {
-  pname = "tamgamp.lv2";
-  version = "unstable-2020-06-14";
+  pname = "tamgamp.lv2-unstable";
+  version = "2020-06-14";
 
   src = fetchFromGitHub {
     owner = "sadko4u";