From 9c9c5865347e010560ad29b52e9c1caf91f84afe Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 14 May 2015 17:18:17 +0200
Subject: Fixed several "package has no version" warnings

---
 pkgs/applications/misc/sqliteman/default.nix               | 14 ++++++++------
 pkgs/applications/networking/cluster/marathon/default.nix  |  2 +-
 pkgs/applications/science/electronics/fritzing/default.nix |  2 +-
 pkgs/applications/version-management/vcprompt/default.nix  |  7 ++++---
 4 files changed, 14 insertions(+), 11 deletions(-)

(limited to 'pkgs/applications')

diff --git a/pkgs/applications/misc/sqliteman/default.nix b/pkgs/applications/misc/sqliteman/default.nix
index f655a0f8c2609..a1d5ef153bbdd 100644
--- a/pkgs/applications/misc/sqliteman/default.nix
+++ b/pkgs/applications/misc/sqliteman/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchurl, cmake, qt4, qscintilla }:
+{ stdenv, fetchFromGitHub, cmake, qt4, qscintilla }:
 
 stdenv.mkDerivation rec {
-  name = "sqliteman";
-  version = "1.2.0-c41b89e1";
+  name = "sqliteman-${version}";
+  version = "1.2.0";
 
-  src = fetchurl {
-    url = https://github.com/pvanek/sqliteman/archive/1.2.0.tar.gz;
-    sha256 = "1x4ppwf01jdnz3a4ycia6vv5qf3w2smbqx690z1pnkwbvk337akm";
+  src = fetchFromGitHub {
+    repo = "sqliteman";
+    owner = "pvanek";
+    rev = version;
+    sha256 = "1blzyh1646955d580f71slgdvz0nqx0qacryx0jc9w02yrag17cs";
   };
 
   buildInputs = [ cmake qt4 qscintilla ];
diff --git a/pkgs/applications/networking/cluster/marathon/default.nix b/pkgs/applications/networking/cluster/marathon/default.nix
index 3eebc6de3cf30..1cc75a71bfa4b 100644
--- a/pkgs/applications/networking/cluster/marathon/default.nix
+++ b/pkgs/applications/networking/cluster/marathon/default.nix
@@ -1,7 +1,7 @@
 { stdenv, makeWrapper, jdk, mesos, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "marathon-v${version}";
+  name = "marathon-${version}";
   version = "0.8.1";
 
   src = fetchurl {
diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix
index f5a835423bdd8..1fa0a0d97b50e 100644
--- a/pkgs/applications/science/electronics/fritzing/default.nix
+++ b/pkgs/applications/science/electronics/fritzing/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
 
   version = "0.9.0b";
-  name = "fritzing";
+  name = "fritzing-${version}";
 
   src = fetchurl {
     url = "http://fritzing.org/download/${version}/source-tarball/fritzing-${version}.source.tar_1.bz2";
diff --git a/pkgs/applications/version-management/vcprompt/default.nix b/pkgs/applications/version-management/vcprompt/default.nix
index 476abd4e19bd5..4afb1b20e32cc 100644
--- a/pkgs/applications/version-management/vcprompt/default.nix
+++ b/pkgs/applications/version-management/vcprompt/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchhg, autoconf, sqlite }:
 
-stdenv.mkDerivation {
-  name = "vcprompt";
+stdenv.mkDerivation rec {
+  name = "vcprompt-${version}";
+  version = "1.2.1";
 
   src = fetchhg {
     url = "http://hg.gerg.ca/vcprompt/";
-    rev = "1.2.1";
+    rev = version;
     sha256 = "03xqvp6bfl98bpacrw4n82qv9cw6a4fxci802s3vrygas989v1kj";
   };
 
-- 
cgit 1.4.1