From 9c9c5865347e010560ad29b52e9c1caf91f84afe Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 14 May 2015 17:18:17 +0200 Subject: [PATCH] Fixed several "package has no version" warnings --- pkgs/applications/misc/sqliteman/default.nix | 14 ++++++++------ .../networking/cluster/marathon/default.nix | 2 +- .../science/electronics/fritzing/default.nix | 2 +- .../version-management/vcprompt/default.nix | 7 ++++--- pkgs/development/arduino/arduino-core/default.nix | 2 +- pkgs/development/tools/misc/uncrustify/default.nix | 5 +++-- .../tools/selenium/chromedriver/default.nix | 6 ++++-- pkgs/games/xsnow/default.nix | 4 ++-- pkgs/tools/networking/atftp/default.nix | 2 +- pkgs/tools/networking/connmanui/default.nix | 8 +++++--- pkgs/tools/video/atomicparsley/default.nix | 5 +++-- 11 files changed, 33 insertions(+), 24 deletions(-) diff --git a/pkgs/applications/misc/sqliteman/default.nix b/pkgs/applications/misc/sqliteman/default.nix index f655a0f8c260..a1d5ef153bbd 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 3eebc6de3cf3..1cc75a71bfa4 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 f5a835423bdd..1fa0a0d97b50 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 476abd4e19bd..4afb1b20e32c 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"; }; diff --git a/pkgs/development/arduino/arduino-core/default.nix b/pkgs/development/arduino/arduino-core/default.nix index a751076537a4..7a960dc931b9 100644 --- a/pkgs/development/arduino/arduino-core/default.nix +++ b/pkgs/development/arduino/arduino-core/default.nix @@ -7,7 +7,7 @@ assert withGui -> gtk2 != null; stdenv.mkDerivation rec { version = "1.0.6"; - name = "arduino${stdenv.lib.optionalString (withGui == false) "-core"}"; + name = "arduino${stdenv.lib.optionalString (withGui == false) "-core"}-${version}"; src = fetchFromGitHub { owner = "arduino"; diff --git a/pkgs/development/tools/misc/uncrustify/default.nix b/pkgs/development/tools/misc/uncrustify/default.nix index f4add9a4b9ea..70aedbb48d23 100644 --- a/pkgs/development/tools/misc/uncrustify/default.nix +++ b/pkgs/development/tools/misc/uncrustify/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "uncrustify"; + name = "${product}-${version}"; + product = "uncrustify"; version = "0.61"; src = fetchurl { - url = "mirror://sourceforge/uncrustify/${name}-${version}.tar.gz"; + url = "mirror://sourceforge/uncrustify/${product}-${version}.tar.gz"; sha256 = "1df0e5a2716e256f0a4993db12f23d10195b3030326fdf2e07f8e6421e172df9"; }; diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index f2d39938a483..8d9db34446d6 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -7,10 +7,12 @@ assert stdenv.system == "x86_64-linux"; stdenv.mkDerivation rec { - name = "chromedriver_linux64"; + product = "chromedriver_linux64"; + name = "${product}-2.14"; + version = "2.14"; src = fetchurl { - url = "http://chromedriver.storage.googleapis.com/2.14/${name}.zip"; + url = "http://chromedriver.storage.googleapis.com/${version}/${product}.zip"; sha256 = "18kpky1v5pc3fv6kv9i2mf4wr4qicmfhf27h9zqy18gh16rlwrin"; }; diff --git a/pkgs/games/xsnow/default.nix b/pkgs/games/xsnow/default.nix index 68b77dd091b6..503deb695f7f 100644 --- a/pkgs/games/xsnow/default.nix +++ b/pkgs/games/xsnow/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { version = "1.42"; - name = "xsnow"; + name = "xsnow-${version}"; src = fetchurl { - url = "http://dropmix.xs4all.nl/rick/Xsnow/xsnow-${version}.tar.gz"; + url = "http://dropmix.xs4all.nl/rick/Xsnow/${name}.tar.gz"; sha256 = "06jnbp88wc9i9dbmy7kggplw4hzlx2bhghxijmlhkjlizgqwimyh"; }; diff --git a/pkgs/tools/networking/atftp/default.nix b/pkgs/tools/networking/atftp/default.nix index 930d9f4968b6..ad2d77f8cfef 100644 --- a/pkgs/tools/networking/atftp/default.nix +++ b/pkgs/tools/networking/atftp/default.nix @@ -9,7 +9,7 @@ debianPatch = fetchurl { }; in stdenv.mkDerivation { - name = "atftp"; + name = "atftp-${version}"; inherit version; src = fetchurl { url = "mirror://debian/pool/main/a/atftp/atftp_${version}.dfsg.orig.tar.gz"; diff --git a/pkgs/tools/networking/connmanui/default.nix b/pkgs/tools/networking/connmanui/default.nix index 62be5bf14e57..280d3d9f9fc6 100644 --- a/pkgs/tools/networking/connmanui/default.nix +++ b/pkgs/tools/networking/connmanui/default.nix @@ -1,10 +1,12 @@ { stdenv, fetchgit, autoconf, automake, libtool, glib, gtk3, dbus, pkgconfig, file, intltool, connman }: -stdenv.mkDerivation { - name = "connmanui-b838e640eddb83d296fb6d146ce756066d37c43b"; +stdenv.mkDerivation rec { + name = "connmanui-${version}"; + version = "e4a8ddcca0870eb2ece5a7e3ea0296de9c86e5b2"; + src = fetchgit { url = "git://github.com/tbursztyka/connman-ui.git"; - rev = "e4a8ddcca0870eb2ece5a7e3ea0296de9c86e5b2"; + rev = version; sha256 = "0rml52v81s7hr0g6qbj5bamli08kn66hay84qicx8sy8679wg443"; }; diff --git a/pkgs/tools/video/atomicparsley/default.nix b/pkgs/tools/video/atomicparsley/default.nix index d4b662c88f17..02381badcc86 100644 --- a/pkgs/tools/video/atomicparsley/default.nix +++ b/pkgs/tools/video/atomicparsley/default.nix @@ -1,11 +1,12 @@ { stdenv, pkgs, fetchurl }: stdenv.mkDerivation rec { - name = "AtomicParsley"; + name = "${product}-${version}"; + product = "AtomicParsley"; version = "0.9.0"; src = fetchurl { - url = "mirror://sourceforge/atomicparsley/${name}-source-${version}.zip"; + url = "mirror://sourceforge/atomicparsley/${product}-source-${version}.zip"; sha256 = "de83f219f95e6fe59099b277e3ced86f0430ad9468e845783092821dff15a72e"; };