treewide: replace '-git' packages with 'unstable-' in version (#145396)

2 files changed, 47 insertions, 36 deletions

diff --git a/pkgs/applications/networking/instant-messengers/tensor/default.nix b/pkgs/applications/networking/instant-messengers/tensor/default.nix
index 477e5442b82..943ec299cdb 100644
--- a/pkgs/applications/networking/instant-messengers/tensor/default.nix
+++ b/pkgs/applications/networking/instant-messengers/tensor/default.nix
@@ -1,17 +1,24 @@
-{ mkDerivation, lib, stdenv, fetchgit, qtbase, qtquickcontrols, qmake
-, makeDesktopItem }:
+{ mkDerivation
+, lib
+, stdenv
+, fetchgit
+, qtbase
+, qtquickcontrols
+, qmake
+, makeDesktopItem
+}:
 
 # we now have libqmatrixclient so a future version of tensor that supports it
 # should use that
 
 mkDerivation rec {
-  pname = "tensor-git";
-  version = "2017-02-21";
+  pname = "tensor";
+  version = "unstable-2017-02-21";
 
   src = fetchgit {
-    url             = "https://github.com/davidar/tensor.git";
-    rev             = "f3f3056d770d7fb4a21c610cee7936ee900569f5";
-    sha256          = "19in8c7a2hxsx2c4lj540w5c3pn1882645m21l91mcriynqr67k9";
+    url = "https://github.com/davidar/tensor.git";
+    rev = "f3f3056d770d7fb4a21c610cee7936ee900569f5";
+    sha256 = "19in8c7a2hxsx2c4lj540w5c3pn1882645m21l91mcriynqr67k9";
     fetchSubmodules = true;
   };
 
@@ -19,14 +26,14 @@ mkDerivation rec {
   nativeBuildInputs = [ qmake ];
 
   desktopItem = makeDesktopItem {
-    name        = "tensor";
-    exec        = "@bin@";
-    icon        = "tensor.png";
-    comment     = meta.description;
+    name = "tensor";
+    exec = "@bin@";
+    icon = "tensor.png";
+    comment = meta.description;
     desktopName = "Tensor Matrix Client";
     genericName = meta.description;
-    categories  = "Chat;Utility";
-    mimeType    = "application/x-chat";
+    categories = "Chat;Utility";
+    mimeType = "application/x-chat";
   };
 
   installPhase = if stdenv.isDarwin then ''
diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix
index 562372b1bb7..ddd94bff522 100644
--- a/pkgs/applications/networking/znc/modules.nix
+++ b/pkgs/applications/networking/znc/modules.nix
@@ -1,25 +1,29 @@
 { lib, stdenv, fetchFromGitHub, znc }:
 
 let
-  zncDerivation = a@{
-    pname, src, module_name,
-    buildPhase ? "${znc}/bin/znc-buildmod ${module_name}.cpp",
-    installPhase ? "install -D ${module_name}.so $out/lib/znc/${module_name}.so", ...
-  } : stdenv.mkDerivation (a // {
-    inherit buildPhase;
-    inherit installPhase;
-
-    buildInputs = znc.buildInputs;
-
-    meta = a.meta // { platforms = lib.platforms.unix; };
-    passthru.module_name = module_name;
-  });
-
-in {
+  zncDerivation =
+    a@{ pname
+    , src
+    , module_name
+    , buildPhase ? "${znc}/bin/znc-buildmod ${module_name}.cpp"
+    , installPhase ? "install -D ${module_name}.so $out/lib/znc/${module_name}.so"
+    , ...
+    }: stdenv.mkDerivation (a // {
+      inherit buildPhase;
+      inherit installPhase;
+
+      buildInputs = znc.buildInputs;
+
+      meta = a.meta // { platforms = lib.platforms.unix; };
+      passthru.module_name = module_name;
+    });
+
+in
+{
 
   backlog = zncDerivation rec {
     pname = "znc-backlog";
-    version = "git-2017-06-13";
+    version = "unstable-2017-06-13";
     module_name = "backlog";
 
     src = fetchFromGitHub {
@@ -39,7 +43,7 @@ in {
 
   clientbuffer = zncDerivation rec {
     pname = "znc-clientbuffer";
-    version = "git-2020-04-24";
+    version = "unstable-2020-04-24";
     module_name = "clientbuffer";
 
     src = fetchFromGitHub {
@@ -59,7 +63,7 @@ in {
 
   clientaway = zncDerivation rec {
     pname = "znc-clientaway";
-    version = "git-2017-04-28";
+    version = "unstable-2017-04-28";
     module_name = "clientaway";
 
     src = fetchFromGitHub {
@@ -79,7 +83,7 @@ in {
 
   fish = zncDerivation rec {
     pname = "znc-fish";
-    version = "git-2017-06-26";
+    version = "unstable-2017-06-26";
     module_name = "fish";
 
     src = fetchFromGitHub {
@@ -99,7 +103,7 @@ in {
 
   ignore = zncDerivation rec {
     pname = "znc-ignore";
-    version = "git-2017-04-28";
+    version = "unstable-2017-04-28";
     module_name = "ignore";
 
     src = fetchFromGitHub {
@@ -139,7 +143,7 @@ in {
 
   playback = zncDerivation rec {
     pname = "znc-playback";
-    version = "git-2015-08-04";
+    version = "unstable-2015-08-04";
     module_name = "playback";
 
     src = fetchFromGitHub {
@@ -159,7 +163,7 @@ in {
 
   privmsg = zncDerivation rec {
     pname = "znc-privmsg";
-    version = "git-2015-02-22";
+    version = "unstable-2015-02-22";
     module_name = "privmsg";
 
     src = fetchFromGitHub {
@@ -177,7 +181,7 @@ in {
 
   push = zncDerivation rec {
     pname = "znc-push";
-    version = "git-2016-10-12";
+    version = "unstable-2016-10-12";
     module_name = "push";
 
     src = fetchFromGitHub {